From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 20 Mar 2011 06:24:48 +0000 (-0700)
Subject: Merge branch 'js/rerere-forget-always-take-pathspec'
X-Git-Tag: v1.7.5-rc0~53
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bcd5461a35c2cb876efc9eb9f66505336ecb192f?ds=inline;hp=-c

Merge branch 'js/rerere-forget-always-take-pathspec'

* js/rerere-forget-always-take-pathspec:
rerere forget: deprecate invocation without pathspec
---

bcd5461a35c2cb876efc9eb9f66505336ecb192f
diff --combined Documentation/git-rerere.txt
index 161ecad2a9,484fdd5be7..52db1d80cf
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@@ -7,7 -7,7 +7,7 @@@ git-rerere - Reuse recorded resolution 
  
  SYNOPSIS
  --------
- 'git rerere' ['clear'|'forget' [<pathspec>]|'diff'|'status'|'gc']
+ 'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc']
  
  DESCRIPTION
  -----------
@@@ -43,7 -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'::
  
@@@ -205,6 -205,11 +205,6 @@@ would conflict the same way as the tes
  'git rerere' will be run by 'git rebase' to help you resolve this
  conflict.
  
 -
 -Author
 -------
 -Written by Junio C Hamano <gitster@pobox.com>
 -
  GIT
  ---
  Part of the linkgit:git[1] suite