From: Kevin Ballard <kevin@sb.org>
Date: Mon, 08 Nov 2010 21:49:44 GMT
Subject: Re: [PATCH] git-rebase--interactive.sh: Add new command "shell"
Message-ID: <663A3F43-5F64-41F0-B272-64EEE9775250@sb.org>
In-Reply-To: <7vd3qfr7ki.fsf@alter.siamese.dyndns.org>

On Nov 8, 2010, at 10:31 AM, Junio C Hamano wrote:

> Yann Dirson <ydirson@free.fr> writes:
> 
>> #  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