diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-13 11:08:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 11:08:35 -0800 |
| commit | d0085ade9598942077f12f22b16978411d15188a (patch) | |
| tree | 27cc41e9eae9f3909aad1f940768d17cccee7abd /Documentation | |
| parent | Merge branch 'np/addcommit' (diff) | |
| parent | rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am (diff) | |
| download | tgif-d0085ade9598942077f12f22b16978411d15188a.tar.xz | |
Merge branch 'ew/rerere'
* ew/rerere:
rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
git-rerere: add 'gc' command.
rerere: add clear, diff, and status commands
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-rerere.txt | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 8b6b651237..116dca4c06 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 ----------- @@ -27,6 +26,38 @@ results and applying the previously recorded hand resolution. You need to create `$GIT_DIR/rr-cache` directory to enable this command. + +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. + +'gc':: + +This command is used to prune records of conflicted merge that +occurred long time ago. + + DISCUSSION ---------- |