Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH 0/4] Enhance git-rebases flexibiilty in handling empty commits

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:26

Neil Horman [off-list ref] writes:
for interactive rebases, I changed the default selection editor text somewhat.
By default, empty commits are allowed in this list.  With patch 4 here, empty
commits are commented out automatically, unless --keep-empty is selected (in
which case all commits are pick-ed).  The user sees additional text indicating
that empty commits are commented and if they wish to be kept, then they must be
uncommented.  The pick_one function then intellegently passes the --keep-empty
option allong to cherry-pick as needed.
Sounds like a sensible UI design.  I am a bit curious what it would do
when you try to "rebase -i" a series of commits, all of which are empty,
though.
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
CC: Jeff King <redacted>
CC: Phil Hord <redacted>
CC: Junio C Hamano <redacted>
Please do not do this; Cc: goes to your e-mail header, not here.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help