Re: [boost] [git] Should I commit to SVN or Git?

Subject: Re: [boost] [git] Should I commit to SVN or Git?
From: Jonathan Wakely (jwakely.boost_at_[hidden])
Date: 2013-02-20 09:42:37

On 20 February 2013 14:35, Beman Dawes wrote:
>
> The one issue I ran into is a single "git svn dcommit" doing separate
> svn commits for each of my local git commits, resulting in 18 svn
> commits and totally incomprehensible history. The point of what should
> have been a single svn commit ("reimplement path::codecvt() and
> path::imbue() portably for more robust behavior") got totally lost.
>
> AFASICT, the fix is to work only on branches, use "git merge
> --no-commit --squash" to merge back to master, do a master commit with
> a meaningful message, then do the "git svn dcommit".
>
> If anyone has a better approach, please let me know:-)

You can still work on master, then before the dcommit do:

git rebase -i

Change all but the first "pick" to "squash" and you'll ge a single
commit combining all the small commits, then dcommit that.