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

From
David Kågedal <hidden>
Date
2016-06-15 22:43:08
Reply to
Eric Wong, 2016-06-15
Eric Wong [off-list ref] writes:
Karl Hasselström [off-list ref] wrote:
quoted
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
Thread (6 messages) 6 messages, 3 authors, 2016-06-15
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help