Is git svn rebase required before git svn dcommit?

Posted by allyourcode on Stack Overflow See other posts from Stack Overflow or by allyourcode
Published on 2010-04-22T23:01:37Z Indexed on 2010/04/22 23:03 UTC
Read the original article Hit count: 256

Filed under:
|

I'm reading about using git as an svn client here:

http://learn.github.com/p/git-svn.html

That page suggests that you do git svn rebase before git svn dcommit, which makes perfect sense; it's like doing svn update before doing svn commit. Then, I started looking at the documentation for git svn dcommit (I was wondering what the 'd' is about):

http://www.kernel.org/pub/software/scm/git/docs/git-svn.html

You have to scroll down a bit to see the documentation on dcommit, which says this:

Commit each diff from a specified head directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head).

This confuses me, because if you do as the first page says, there will be no changes to pull down from svn once the first part of dcommit finishes.

I'm also confused by the part that talks about reset; isn't git reset for removing changes from the staging area?

Why would rebase or reset follow (the first part of) a dcommit?

© Stack Overflow or respective owner

Related posts about git

Related posts about git-svn