mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
e521850bfd
commit
3e7a1df84d
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue