From: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Date: Thu, 07 Jun 2007 17:08:16 GMT
Subject: git-svn removes merge
Message-ID: <1181236096.30670.66.camel@gentoo-jocke.transmode.se>

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?