CODEWITHSUNDEEP
gitsvngit-svnrebase
user2088881
user2088881

Reputation: 31

difference between 'git svn rebase' and 'git rebase trunk'

I am using git-svn for my project.

What is the difference between git svn rebase and git rebase trunk?

Is git svn rebase run on master basically the same as git rebase trunk run on master?

Upvotes: 3

Views: 658

Answers (1)

me_and
me_and

Reputation: 15634

No. git svn rebase is equivalent to running the following:

git svn fetch --parent
git rebase remotes/trunk

(That assumes the Git branch you're working on is based off remotes/trunk; if it's based off a different Subversion branch, it will rebase onto the correct branch.)

The difference is that git svn rebase pulls the latest code from Subversion before doing the rebase, and it also automatically works out the correct remote branch to rebase against.

Upvotes: 4

Related Questions