If I do this: git checkout --track -b svn remotes/trunk git checkout -b merge git-am ../mbox git checkout svn #edit Makefile and commit git-svn dcommit #Note 1 git pull . merge git-svn dcommit then git-svn dcommit removes the merge beteen svn and merge. git log svn..merge shows all the commits that git-am ../mbox added. How do I avoid this? Jocke Note 1: If I skip this step then the last git-svn dcommit fails, why is that? - 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
