From: Pierre Habouzit <madcoder@debian.org>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Pierre Habouzit <madcoder@debian.org>
Subject: [PATCH] git-rebase -i: improve help readability
Date: Wed, 11 Jun 2008 17:01:30 +0200 [thread overview]
Message-ID: <1213196490-7762-2-git-send-email-madcoder@debian.org> (raw)
In-Reply-To: <1213196490-7762-1-git-send-email-madcoder@debian.org>
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---
git-rebase--interactive.sh | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index c1b4260..a3c5488 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -695,15 +695,16 @@ do
# to a commit previously marked with the 'mark' insn.
#
# Commands:
-# p, pick = use commit
-# e, edit = use commit, but stop for amending
-# c, comment = use commit, but stop for changing the commit message
-# s, squash = use commit, but meld into previous commit
-# mark :mark = mark the current HEAD for later reference
-# reset commit = reset HEAD to the commit
-# merge commit-M commit-P ... = redo merge commit-M with the
-# current HEAD and the parents commit-P
-# tag = reset tag to the current HEAD
+# p, pick use commit
+# e, edit use commit, but stop for amending
+# c, comment use commit, but update the commit message on the way
+# s, squash use commit, but meld into previous commit
+# mark :mark mark the current HEAD for later reference
+# reset commit reset HEAD to the commit
+# merge commit-M commit-P
+# redo merge commit-M with the current HEAD
+# and the parents commit-P
+# tag reset tag to the current HEAD
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
--
1.5.6.rc2.128.g6656e
next prev parent reply other threads:[~2008-06-11 15:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-11 15:01 [PATCH] git-rebase -i: have an option for amending the commit message only Pierre Habouzit
2008-06-11 15:01 ` Pierre Habouzit [this message]
2008-06-11 18:36 ` Olivier Marin
2008-06-11 22:27 ` Pierre Habouzit
2008-06-11 22:51 ` Stephan Beyer
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=1213196490-7762-2-git-send-email-madcoder@debian.org \
--to=madcoder@debian.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).