diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-07-05 23:25:23 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-07-05 23:25:23 +0000 |
| commit | 3e3aa8124a1b317bf174b7ee064b96c1399cfb8d (patch) | |
| tree | 77b19374c97dd9ea4f7cb1dacb3097f7fd8ed7de /git-rerere.txt | |
| parent | 7d44952cc831fe14797546fa07afc857b0844d25 (diff) | |
| download | git-htmldocs-3e3aa8124a1b317bf174b7ee064b96c1399cfb8d.tar.gz | |
Autogenerated HTML docs for v1.7.2-rc1-7-g869d
Diffstat (limited to 'git-rerere.txt')
| -rw-r--r-- | git-rerere.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index acc220a00..db99d4786 100644 --- a/git-rerere.txt +++ b/git-rerere.txt @@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges SYNOPSIS -------- -'git rerere' ['clear'|'diff'|'status'|'gc'] +'git rerere' ['clear'|'forget' [<pathspec>]|'diff'|'status'|'gc'] DESCRIPTION ----------- @@ -40,6 +40,11 @@ This resets 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 +conflict in <pathspec>. The <pathspec> is optional. + 'diff':: This displays diffs for the current state of the resolution. It is |