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

[...stripped the Cc, as we're slightly changing topic...]

On 9/18/07, Johannes Schindelin [off-list ref] wrote:

On Tue, 18 Sep 2007, Lars Hjemli wrote:

quoted

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.

Linus explained a lot of times why this is wrong.  It encourages
upstream-downstream thinking.  We should really turn this into a FAQ.

Well, the cases where I've wanted to do this is when I've developed
some new feature in cgit as a topic branch. I've then merged the topic
branch into my master branch which had been idle since the creation of
the topic branch (cgit doesn't get as many patches as git...). So I
get a fast-forward and my precious topic-branch is no longer visible
(at least for anyone cloning my repo). Not very important, but I'd
like to preserve the fact that this was a topic branch. How would this
encourage 'upstream-downstream thinking'?

-- 
larsh