Hi, On Tue, 18 Sep 2007, Lars Hjemli wrote: > 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. Ciao, Dscho - 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