rerere: Document 'rerere remaining'
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. Touch up the other rerere commands to reduce noise. First noticed by Vincent van Ravesteijn. Signed-off-by: Phil Hord <phil.hord@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phil Hord committed
Mar 8, 2012 at 16:08 UTC
3e7a1df84d1eba94530d5bf62caa215f5d3e78d3
1 file changed
+12
-7
Documentation/git-rerere.txt
+12
-7
@@ -8,7 +8,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
8
SYNOPSIS
9
--------
10
[verse]
11
-'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc']
11
+'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']
12
13
DESCRIPTION
14
-----------
@@ -37,30 +37,35 @@ its working state.
37
38
'clear'::
39
40
-This resets the metadata used by rerere if a merge resolution is to be
40
+Reset the metadata used by rerere if a merge resolution is to be
41
aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]'
42
will automatically invoke this command.
43
44
'forget' <pathspec>::
45
46
-This resets the conflict resolutions which rerere has recorded for the current
46
+Reset the conflict resolutions which rerere has recorded for the current
47
conflict in <pathspec>.
48
49
'diff'::
50
51
-This displays diffs for the current state of the resolution. It is
51
+Display diffs for the current state of the resolution. It is
52
useful for tracking what has changed while the user is resolving
53
conflicts. Additional arguments are passed directly to the system
54
'diff' command installed in PATH.
55
56
'status'::
57
58
-Like 'diff', but this only prints the filenames that will be tracked
59
-for resolutions.
58
+Print paths with conflicts whose merge resolution rerere will record.
59
+
60
+'remaining'::
61
+
62
+Print paths with conflicts that have not been autoresolved by rerere.
63
+This includes paths whose resolutions cannot be tracked by rerere,
64
+such as conflicting submodules.
65
66
'gc'::
67
63
-This prunes records of conflicted merges that
68
+Prune records of conflicted merges that
69
occurred a long time ago. By default, unresolved conflicts older
70
than 15 days and resolved conflicts older than 60
71
days are pruned. These defaults are controlled via the