From: Avery Pennarun Date: Thu, 10 Jun 2010 07:11:13 GMT Subject: Re: Git and svn as target Message-ID: In-Reply-To: <20100610060525.GA2177@m62s10.vlinux.de> On Thu, Jun 10, 2010 at 2:05 AM, Peter Baumann wrote: > On Thu, Jun 10, 2010 at 07:45:15AM +0200, Matthias Fechner wrote: >> In the commit of svn I see only merged test... >> Could I say git to put all the commit comments into the merge? > > AFAIK git svn doesn't handle git merges very well. If you rebase your test branch onto > master and then do the git-svn dcommit, everything should work as expected. Right. I actually like it that way much more than I like rebasing onto master, but that's a matter of opinion, of course. Another option would be to simply do "git svn dcommit" from the 'test' branch rather than merging it into master first. (This essentially asks git-svn to do your rebasing for you, so it's roughly the same thing as merge-rebase-dcommit.) You might like to look at the option "merge.log" in "man git-config". This summarizes your commit messages into the merge commit's commit message, sort of like how svn itself does it. Then you still only have one merge commit - like you do in svn - but it has a useful commit message. Have fun, Avery