summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-26 19:10:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-26 19:10:12 (GMT)
commitbda02ebc39fc9e46c979eee8026a66ac1a060dbd (patch)
tree11e63818a348f1f450d92f0a6bbd74a1ae19504c
parented6ce4382b5cb34e98ca3db2f19de82a037da322 (diff)
parent3e7a1df84d1eba94530d5bf62caa215f5d3e78d3 (diff)
downloadgit-bda02ebc39fc9e46c979eee8026a66ac1a060dbd.zip
git-bda02ebc39fc9e46c979eee8026a66ac1a060dbd.tar.gz
git-bda02ebc39fc9e46c979eee8026a66ac1a060dbd.tar.bz2
Merge branch 'ph/rerere-doc' into maint
* ph/rerere-doc: rerere: Document 'rerere remaining'
-rw-r--r--Documentation/git-rerere.txt19
1 files changed, 12 insertions, 7 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index a6253ba..b43b7c8 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
-----------
@@ -37,30 +37,35 @@ its working state.
'clear'::
-This resets the metadata used by rerere if a merge resolution is to be
+Reset the metadata used by rerere if a merge resolution is to be
aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]'
will automatically invoke this command.
'forget' <pathspec>::
-This resets the conflict resolutions which rerere has recorded for the current
+Reset the conflict resolutions which rerere has recorded for the current
conflict in <pathspec>.
'diff'::
-This displays diffs for the current state of the resolution. It is
+Display diffs for the current state of the resolution. It is
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.
'status'::
-Like 'diff', but this only prints the filenames that will be tracked
-for resolutions.
+Print paths with conflicts whose merge resolution rerere will record.
+
+'remaining'::
+
+Print paths with conflicts that have not been autoresolved by rerere.
+This includes paths whose resolutions cannot be tracked by rerere,
+such as conflicting submodules.
'gc'::
-This prunes records of conflicted merges that
+Prune records of conflicted merges that
occurred a long time ago. By default, unresolved conflicts older
than 15 days and resolved conflicts older than 60
days are pruned. These defaults are controlled via the