From: Vincent van Ravesteijn Date: Tue, 06 Mar 2012 12:21:52 GMT Subject: [PATCH] Documentation/git-rerere: document 'remaining' command Message-ID: <1331036512-7626-1-git-send-email-vfr@lyx.org> From: Vincent van Ravesteijn This adds the 'remaining' command to the documentation of 'git rerere'. This command was added in ac49f5ca (Feb 16 2011; Martin von Zweigbergk ) but it was never documented. Signed-off-by: Vincent van Ravesteijn --- 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' |'diff'|'status'|'gc'] +'git rerere' ['clear'|'forget' |'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