From: Jonathan Nieder <jrnieder@gmail.com>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: git@vger.kernel.org, gitster@pobox.com,
Kevin Ballard <kevin@sb.org>, Yann Dirson <dirson@bertin.fr>,
Eric Raible <raible@nextest.com>
Subject: [PATCH 1/2] rebase -i: reword in-editor documentation of "exec"
Date: Sat, 15 Jan 2011 20:01:32 -0600 [thread overview]
Message-ID: <20110116020132.GB28137@burratino> (raw)
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
next prev parent reply other threads:[~2011-01-16 2:01 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 13:08 Black smoke from git rebase -i exec Ævar Arnfjörð Bjarmason
2010-08-10 13:37 ` Matthieu Moy
2010-08-10 13:57 ` Ævar Arnfjörð Bjarmason
2010-08-10 14:12 ` Johannes Sixt
2010-08-10 14:16 ` Ævar Arnfjörð Bjarmason
2010-08-10 15:05 ` Matthieu Moy
2010-08-10 15:17 ` [PATCH 1/2 (fix broken test)] rebase -i: add exec command to launch a shell command Matthieu Moy
2010-08-11 18:31 ` Junio C Hamano
2010-08-12 7:47 ` Matthieu Moy
2011-01-16 1:59 ` [PATCH 0/2] rebase -i: in-editor documentation nits Jonathan Nieder
2011-01-16 2:01 ` Jonathan Nieder [this message]
2011-01-16 10:27 ` [PATCH 1/2] rebase -i: reword in-editor documentation of "exec" Matthieu Moy
2011-01-18 15:05 ` Junio C Hamano
2011-01-20 20:09 ` Jonathan Nieder
2011-01-20 20:59 ` Junio C Hamano
2011-01-21 0:36 ` [PATCH 1/2 v2] rebase -i: clarify " Jonathan Nieder
2011-01-21 6:59 ` Matthieu Moy
2011-01-21 7:47 ` Jonathan Nieder
2011-01-21 10:43 ` Matthieu Moy
2011-01-16 2:02 ` [PATCH 2/2] rebase -i: explain how to discard all commits Jonathan Nieder
2011-01-20 19:39 ` [PATCH 2/2] " Nicolas Sebrecht
2011-01-20 19:57 ` Jonathan Nieder
2011-01-20 20:08 ` Nicolas Sebrecht
2011-01-20 20:34 ` Thomas Rast
2011-01-20 21:28 ` Junio C Hamano
2011-01-21 7:04 ` Johannes Schindelin
2011-01-21 7:37 ` [PATCH] Documentation: suggest "reset --keep" to undo a commit Jonathan Nieder
2011-01-21 17:34 ` Junio C Hamano
2011-01-21 19:14 ` Jonathan Nieder
2011-01-21 20:28 ` Junio C Hamano
2011-01-21 16:51 ` [PATCH 2/2] Re: rebase -i: explain how to discard all commits Junio C Hamano
2011-01-21 17:05 ` Matthieu Moy
2011-01-21 17:57 ` Joshua Jensen
2011-01-21 18:37 ` [PATCH] Documentation: do not treat reset --keep as a special case Jonathan Nieder
2011-01-21 20:35 ` Junio C Hamano
2011-01-26 7:33 ` [PATCH 2/2] Re: rebase -i: explain how to discard all commits Jay Soffian
2011-01-23 20:10 ` Johannes Schindelin
2010-08-10 15:17 ` [PATCH 2/2] test-lib: user-friendly alternatives to test [-d|-f|-e] Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110116020132.GB28137@burratino \
--to=jrnieder@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=dirson@bertin.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kevin@sb.org \
--cc=raible@nextest.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).