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

From: Andreas Ericsson <ae@op5.se>
Date: Sep 17, 2007, 12:39 UTC
Message-ID: <46EE7584.8010202@op5.se>
In-Reply-To: <11900314321506-git-send-email-hjemli@gmail.com>

Lars Hjemli wrote:

Show 15 quoted lines

> This new option forces all merges to create a "true" merge commit, i.e. a
> commit with multiple parents.
> 
> Although a fast-forward would normally be The Right Thing, it isn't when the
> branches to be merged originated in subversion and the merge commit will
> be pushed back by means of 'git svn dcommit'. In these cases, a fast-
> forward merge simply will not work.
> 
>  	If there is no `-s` option, a built-in list of strategies
>  	is used instead (`git-merge-recursive` when merging a single
>  	head, `git-merge-octopus` otherwise).
> +
> +--no-ff::
> +	Force the creation of a merge commit even when the merge would
> +	have resolved as a fast-forward operation.

+ Although a fast-forward would normally be The Right Thing, it isn't when the
+ branches to be merged originated in subversion and the merge commit will
+ be pushed back by means of 'git svn dcommit'. In these cases, a fast-
+ forward merge simply will not work.

Otherwise someone will sit down and try to figure out why this is necessary.

I'm having trouble understanding why this is needed, but I'll take your word for it ;-)

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231