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

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

diff --combined Documentation/git-rerere.txt
index 161ecad2a9b418b8bf0edb7ed50ae959840c4250,484fdd5be7901a45d94dd4362c91339ed0753995..52db1d80cfe068f39ae5996a88e95bbfcf095a36
--- 1/Documentation/git-rerere.txt
--- 2/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