Re: git-svn and repository hierarchy?

On Fri, Feb 27, 2009 at 6:58 PM, Josef Wolf wrote:

At the time I read the tutorials/howtos/whatever, I thought I understand
what "rebase" actually means.  But now I get pretty much confused, since
there are "git rebase", "git pull --rebase" and "git svn rebase" involved,
and they all seem to do very different things.

(simplified, take with grain of salt:)
"git pull" is short for "git fetch && git merge <tracking branch>"
"git pull --rebase" is short for "git fetch && git rebase <tracking branch>"
"git svn rebase" is short for "git svn fetch && git rebase <svn
tracking branch>"
"git svn dcommit" is short for "while (changes) { svn ci && git svn rebase }"

It's all just shortcuts for the same operations underneath. Does that help?

Peter Harris