summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-20 06:24:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-20 06:24:48 (GMT)
commitbcd5461a35c2cb876efc9eb9f66505336ecb192f (patch)
tree9ac7a616fa198874af9b85ece5e9c945183cdfce /Documentation
parent1e239079f704b840778c263f35f1e299565d4a49 (diff)
parent5d2c3b01604a170c52262bf2751c55053d6bd8c1 (diff)
downloadgit-bcd5461a35c2cb876efc9eb9f66505336ecb192f.zip
git-bcd5461a35c2cb876efc9eb9f66505336ecb192f.tar.gz
git-bcd5461a35c2cb876efc9eb9f66505336ecb192f.tar.bz2
Merge branch 'js/rerere-forget-always-take-pathspec'
* js/rerere-forget-always-take-pathspec: rerere forget: deprecate invocation without pathspec
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-rerere.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index 161ecad..52db1d8 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/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'::