[PATCH 1/2] rebase -i: reword in-editor documentation of "exec"
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Jan 16, 2011, 02:01 UTC
- Message-ID
- <20110116020132.GB28137@burratino>
- In-Reply-To
- <20110116015941.GA28137@burratino>
The argument to the "exec" insn represents a command to be passed to the user's shell. (At first I misread the description as meaning it should itself be the name of a shell.)
While fixing that, format the description to more closely parallel the descriptions of other commands.
Before:
# e, edit = use commit, but stop for amending # s, squash = use commit, but meld into previous commit # f, fixup = like "squash", but [...] # x <cmd>, exec <cmd> = Run a shell command <cmd>, and stop if it fails # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted.
After:
[...] # f, fixup = like "squash", but [...] # x, exec = run command using shell, and stop if it fails # # If you remove a line [...]
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- It would be nice to say "stop for amending if it fails" (or similar) to make the relationship to the edit insn clearer, but it is not clear how to make room for that.
git-rebase--interactive.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index a5ffd9a..09aeecf 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -1021,7 +1021,7 @@ first and then run 'git rebase --continue' again." # 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 <cmd>, exec <cmd> = Run a shell command <cmd>, and stop if it fails +# x, exec = run command using shell, and stop if it fails # # If you remove a line here THAT COMMIT WILL BE LOST. # However, if you remove everything, the rebase will be aborted.
-- 1.7.4.rc2