From: Andreas Schwab <schwab@linux-m68k.org>
Date: Mon, 07 Mar 2011 21:10:02 GMT
Subject: Re: Is there a way to add a default `--squash` flag for all merges into a head?
Message-ID: <m2r5aibpsl.fsf@igel.home>
In-Reply-To: <9f02bed0-fa18-46b1-a3d3-346e1cc7dc01@k15g2000prk.googlegroups.com>

Dun Peal <dunpealer@gmail.com> writes:

> There's a configuration feaute `branch.<name>.rebase` for specifying
> that all merges into a branch (master in this case) would be done by
> rebase

That's not what it means.  It means that a "git pull" is implicitly "git
pull --rebase".  But if you do an explict merge it will not look at that
config setting.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."