On 9/18/07, Sam Vilain <sam@xxxxxxxxxx> 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). 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. -- larsh - 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
