Re: git-svn: commit all changes as one svn revision?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



You wrote:
> I make a bunch of git commits developing something that was checked
> out from a svn repo using git-svn.  I want to commit all the changes
> since my last dcommit as one revision, rather than having each git
> commit checked in separately, as dcommit behaves.

I usually do

$ git checkout -b side master
... edit, commit ...
$ git checkout master
$ git merge --no-ff side
$ git-svn dcommit

The resulting merge commit looks like a normal merge to Git (keeping
history intact), but like a squashed commit of all changes on 'side'
to SVN.

(If you made all commits on master, you can branch 'side' and hard
reset master to origin/master first.)

- Thomas

-- 
Thomas Rast
trast@xxxxxxxxxxxxxxx


--
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

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux