Lars Hjemli wrote:
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@xxxxxx OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
