Re: [git-svn PATCH] Add --no-rebase option to git-svn dcommit

From: David Kågedal <davidk@lysator.liu.se>
Date: May 4, 2007, 09:08 UTC
Message-ID: <87slad553c.fsf@morpheus.local>
In-Reply-To: <20070504075908.GB17526@muzzle>

Eric Wong <normalperson@yhbt.net> writes:

Show 9 quoted lines

> Karl Hasselström <kha@treskal.com> wrote:
>> git-svn dcommit exports commits to Subversion, then imports them back
>> to git again, and last but not least rebases or resets HEAD to the
>> last of the new commits. I guess this rebasing is convenient when
>> using just git, but when the commits to be exported are managed by
>> StGIT, it's really annoying. So add an option to disable this
>> behavior. And document it, too!
>
> Cool, I've been planning to add this myself, too.

One thing I haven't figured out, although I haven't looked at the code much, is this: When does git-svn do a merge rather than a rebase? How can there ever be a diff? Is this perhaps something that can happen if you use set-tree, because I don't see how it happens with dcommit.

-- 
David Kågedal