Re: [PATCH] git-merge: add option --no-ff

From: Sam Vilain <sam@vilain.net>
Date: Sep 18, 2007, 11:50 UTC
Message-ID: <46EFBB9A.5070404@vilain.net>
In-Reply-To: <8c5c35580709180419i4500a2d4s8a997d45dd31944e@mail.gmail.com>

Lars Hjemli wrote:

Show 12 quoted lines

> On 9/18/07, Sam Vilain <sam@vilain.net> wrote:
>   
>> I think that writing a real fast-forward merge should only happen on
>> dcommit, not git merge, because that is what is required for SVN.
>>     
>
> I don't think git-svn has any way of knowing that the user wanted a
> merge, unless a merge commit is present. So the user would have to
> specify the set of commits which should be considered a merge during
> dcommit (this would actually resemble how merges are performed in
> subversion).
>

Sure it can. If you're committing to branch X, and the current tree has a whole lot of commits above that, then it should do the only thing you can do with SVN.

Which is write a squash commit, and set the "svn:merge" and/or "svk:merge" properties to represent what happened.

> Sidenote: this might be slightly controversial, but I've sometimes
> missed a --no-ff option to 'git merge' when working on plain git
> repositories; IMHO preserving the 'logical' merge history when the
> merge of a topic branch results in a fast-forward can be interesting.

If you really want one, use git commit-tree directly.

Sam.