From: Vincent van Ravesteijn <vfr@lyx.org>
To: git@vger.kernel.org
Cc: martin.von.zweigbergk@gmail.com, gitster@pobox.com,
Vincent van Ravesteijn <vfr@lyx.org>
Subject: [PATCH] Documentation/git-rerere: document 'remaining' command
Date: Tue, 6 Mar 2012 13:21:52 +0100 [thread overview]
Message-ID: <1331036512-7626-1-git-send-email-vfr@lyx.org> (raw)
From: Vincent van Ravesteijn <vfr@lyx.org>
This adds the 'remaining' command to the documentation of
'git rerere'. This command was added in ac49f5ca (Feb 16 2011;
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>) but
it was never documented.
Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
---
Documentation/git-rerere.txt | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index a6253ba..b75d34b 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -8,7 +8,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
SYNOPSIS
--------
[verse]
-'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc']
+'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']
DESCRIPTION
-----------
@@ -53,6 +53,14 @@ useful for tracking what has changed while the user is resolving
conflicts. Additional arguments are passed directly to the system
'diff' command installed in PATH.
+'remaining'::
+
+Like 'diff', but this only prints the unresolved filenames. This
+includes the files for which rerere tracks the resolution (as shown
+by 'git rerere status'), but also the files for which the conflicts
+cannot be tracked by rerere, e.g. files with conflicts that do not
+have both our side and their side like "we modified, they deleted".
+
'status'::
Like 'diff', but this only prints the filenames that will be tracked
--
1.7.5.4
next reply other threads:[~2012-03-06 12:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-06 12:21 Vincent van Ravesteijn [this message]
2012-03-06 19:24 ` [PATCH] Documentation/git-rerere: document 'remaining' command Junio C Hamano
2012-03-07 22:10 ` Phil Hord
2012-03-07 22:24 ` Junio C Hamano
2012-03-08 3:08 ` Phil Hord
2012-03-08 5:23 ` Junio C Hamano
2012-03-08 21:08 ` Phil Hord
2012-03-08 22:30 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331036512-7626-1-git-send-email-vfr@lyx.org \
--to=vfr@lyx.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.von.zweigbergk@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).