From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"SZEDER Gábor" <szeder@ira.uka.de>
Subject: [PATCH] documentation: 'git am --abort' also invokes 'git rerere clear'
Date: Wed, 23 Jul 2008 19:14:53 +0200 [thread overview]
Message-ID: <1216833293-15925-1-git-send-email-szeder@ira.uka.de> (raw)
Other git commands invoking 'git rerere clear' are mentioned there,
except this.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
---
Documentation/git-rerere.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index beebd53..5246565 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -37,8 +37,8 @@ its working state.
'clear'::
This resets the metadata used by rerere if a merge resolution is to be
-is aborted. Calling 'git-am --skip' or 'git-rebase [--skip|--abort]'
-will automatically invoke this command.
+is aborted. Calling 'git-am [--skip|--abort]' or 'git-rebase
+[--skip|--abort]' will automatically invoke this command.
'diff'::
--
1.6.0.rc0.36.g3c05
reply other threads:[~2008-07-23 17:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1216833293-15925-1-git-send-email-szeder@ira.uka.de \
--to=szeder@ira.uka.de \
--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