diff options
author | Junio C Hamano <junio@kernel.org> | 2011-03-20 19:42:22 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2011-03-20 19:42:22 +0000 |
commit | d2c978f6be36b38127b58af46e28e3ae590b2d3b (patch) | |
tree | 88d8b45014f2b361e18b1aa71f48160ad7f5dc3f /git-rerere.txt | |
parent | fa28cb14513978502ac466090afe34c3479fc90b (diff) | |
download | git-htmldocs-d2c978f6be36b38127b58af46e28e3ae590b2d3b.tar.gz |
Autogenerated HTML docs for v1.7.4.1-343-ga91df
Diffstat (limited to 'git-rerere.txt')
-rw-r--r-- | git-rerere.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rerere.txt b/git-rerere.txt index 161ecad2a..52db1d80c 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'|'forget' [<pathspec>]|'diff'|'status'|'gc'] +'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc'] DESCRIPTION ----------- @@ -43,7 +43,7 @@ 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. +conflict in <pathspec>. 'diff':: |