summaryrefslogtreecommitdiff
path: root/Documentation/git-rerere.txt
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-12-08 21:29:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-09 19:09:27 (GMT)
commitd9671b75ad3bbf2f95f11a8571e9beaa12ccf6dd (patch)
tree77927d02162907505221d58d57c0af972fb6a1cd /Documentation/git-rerere.txt
parent4cfeccc75d6ab1ccc433770bac6bf3b15ab486d6 (diff)
downloadgit-d9671b75ad3bbf2f95f11a8571e9beaa12ccf6dd.zip
git-d9671b75ad3bbf2f95f11a8571e9beaa12ccf6dd.tar.gz
git-d9671b75ad3bbf2f95f11a8571e9beaa12ccf6dd.tar.bz2
rerere: add clear, diff, and status commands
git-am and git-rebase will be updated to use 'clear', and diff/status can be used to aid the user in tracking progress in the resolution process. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-rerere.txt')
-rw-r--r--Documentation/git-rerere.txt27
1 files changed, 25 insertions, 2 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 8b6b651..22494b2 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -7,8 +7,7 @@ git-rerere - Reuse recorded resolve
SYNOPSIS
--------
-'git-rerere'
-
+'git-rerere' [clear|diff|status]
DESCRIPTION
-----------
@@ -167,6 +166,30 @@ would conflict the same way the test merge you resolved earlier.
`git-rerere` is run by `git rebase` to help you resolve this
conflict.
+COMMANDS
+--------
+
+Normally, git-rerere is run without arguments or user-intervention.
+However, it has several commands that allow it to interact with
+its working state.
+
+'clear'::
+
+This resets the metadata used by rerere if a merge resolution is to be
+is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
+[--skip|--abort] will automatcally invoke this command.
+
+'diff'::
+
+This displays 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(1) command installed in PATH.
+
+'status'::
+
+Like diff, but this only prints the filenames that will be tracked
+for resolutions.
Author
------