diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-12-13 21:32:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-12-13 21:32:17 +0000 |
| commit | e7935c49199b7d60c02043382b62ce70d36017e9 (patch) | |
| tree | 280d09d89444d318008e632fbb9c9d88a393cacf /git-rerere.txt | |
| parent | 3f403b04bd95096f37297ab2cfbd4ad1f6dbb904 (diff) | |
| download | git-htmldocs-e7935c49199b7d60c02043382b62ce70d36017e9.tar.gz | |
Autogenerated HTML docs for v1.4.4.2-g1d77
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index 8b6b65123..116dca4c0 100644 --- a/git-rerere.txt +++ b/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 ---------- |