Re: git-svn and rebase causes duplicate log entries in svn

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

 



Hi Joakim,

"Joakim Tjernlund" <joakim.tjernlund@xxxxxxxxxxxx> writes:
> Now I want to rebase my svn branch against latest u-boot and commit
> my rebased svn branch to svn.
>
> I use git-svn commit -b svn -q remotes/git-svn..svn to commit my latest
> changes and when I do so I see my local changes once more in the svn
> log:
> Any way to avoid that?

I think you want to use git-svn dcommit, and not commit.  See the
notes in the git-svn man page.  The basic workflow
that I've been using is:

git-svn fetch  
git rebase remotes/git-svn  ## on mybranch
## make commits on mybranch
git-svn dcommit remotes/git-svn..mybranch

This results in each commit that I made on mybranch being sent to svn
as a separate commit.

+ seth
-
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]