index 161ecad2a9b418b8bf0edb7ed50ae959840c4250..52db1d80cfe068f39ae5996a88e95bbfcf095a36 100644 (file)
SYNOPSIS
--------
SYNOPSIS
--------
-'git rerere' ['clear'|'forget' [<pathspec>]|'diff'|'status'|'gc']
+'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc']
DESCRIPTION
-----------
DESCRIPTION
-----------
'forget' <pathspec>::
This resets the conflict resolutions which rerere has recorded for the current
'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'::
'diff'::