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

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Nov 10, 2010, 01:53 UTC
Message-ID: <20101110015327.GB1503@burratino>
In-Reply-To: <7vd3qfr7ki.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

> Yann Dirson <ydirson@free.fr> writes:

>> #  e, edit = use commit (if specified) but pause to amend/examine/test

[...]

Show 11 quoted lines

>                     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?

If we explain it clearly then I think yes, the end user would not be confused.

The above description (that starts with "e, edit") looks more like a reminder than a full explanation. Can we rely on the perplexed operator to read the text after the command list?

If so, some trailing explanation[1] might help.

# Commands: # p, pick = use commit # r, reword = use commit, but edit the commit message # e, edit = use commit (if specified), but stop to amend/examine/test # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but discard this commit's log message # x, exec = run command using shell, and stop if it fails # # The argument to edit is optional; if left out or equal to "-", # it means to stop to examine or amend the previous commit. # # If you remove a line here, THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted. # Use the noop command if you really want to remove all commits.

[1] http://thread.gmane.org/gmane.comp.version-control.git/160691/focus=160742