From: Dun Peal <dunpealer@gmail.com>
Date: Mon, 07 Mar 2011 21:48:46 GMT
Subject: Re: Is there a way to add a default `--squash` flag for all merges into a head?
Message-ID: <b98e837f-a0ae-4061-aa09-b4d30e3b0522@b13g2000prf.googlegroups.com>
In-Reply-To: <m2r5aibpsl.fsf@igel.home>

Sigh. You're right, what a silly man I am!!!

I assume there's no way to do what I want, except maybe encourage
everyone to use an alias for `git merge` that includes the flag.

Thanks, D.

On Mar 7, 3:10 pm, Andreas Schwab <sch...@linux-m68k.org> wrote:
> Dun Peal <dunpea...@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, sch...@linux-m68k.org
> GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
> "And now for something completely different."
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html