Thread (5 messages) flat view 5 messages, 3 authors, 2016-06-15

Re: git interactive rebase 'consume' command

From: Stephen Kelly <hidden>
Date: 2016-06-15 22:55:49

John Keeping wrote:
quoted
Any thoughts on that?
Are you aware of the "--autosqush" option to git-rebase (and the
"rebase.autosquash" config setting)?  I find that using that combined
with the "--fixup" option to git-commit makes this workflow a lot more
intuitive.
Yes, I'm aware of it, but I think it's not related to the proposal I made. 

Mostly my proposal is about avoiding unnecessary conflict resolution.

Thanks,

Steve.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help