Thread (16 messages) flat view 16 messages, 6 authors, 2016-06-15

Re: [PATCH] git-rebase--interactive.sh: Add new command "shell"

From: Kevin Ballard <hidden>
Date: 2016-06-15 22:49:59

Possibly related (same subject, not in this thread)

On Nov 8, 2010, at 10:31 AM, Junio C Hamano wrote:
Yann Dirson [off-list ref] writes:
quoted
#  e, edit = use commit (if specified) but pause to amend/examine/test
When an end user is given

   pick one
   pick two
   pick three
   ...

and told the above, would it be crystal clear that, if he changed the insn
sheet to

   pick one
   edit
   pick three
   ...

then he will _lose_ the change made by foo, or will the user come back
here and complain that a precious change "two" is lost and it is git's
fault?
On the one hand, once someone understands what the todo list is actually
doing, then it should be instantly obvious that removing the reference to
a commit will remove that commit entirely. On the other hand, I agree it
may be confusing to new git users (or new rebase users). Do you have an
alternative solution in mind?

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