From: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri, 21 Jan 2011 07:47:00 GMT
Subject: Re: [PATCH 1/2 v2] rebase -i: clarify in-editor documentation of "exec"
Message-ID: <20110121074700.GA26600@burratino>
In-Reply-To: <vpqr5c6zqrh.fsf@bauges.imag.fr>

Matthieu Moy wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:

>> -#  x <cmd>, exec <cmd> = Run a shell command <cmd>, and stop if it fails
>> +#  x, exec = run command specified on the rest of the line
>
> I don't think dropping "shell" is a good idea. In this context,
> "command" could mean "one of pick/fixup/squash/...", a Git command,
> and at last, an arbitrary line of shell.

Hmm.  I suppose

# Commands:
#  p, pick = use commit
#  r, reword = use commit, but edit the commit message
#  e, edit = use commit, but stop for amending
#  s, squash = use commit, but meld into previous commit
#  f, fixup = like "squash", but discard this commit's log message
#  x, exec = run command (the rest of the line) using shell

would do?

Sorry to take so long to get this right.