index 08a055713cd7bc83e6e0385d8e9ed3b7d9951742..139b6eb7733aaf246af8ce77f6483fa15e5de2b0 100644 (file)
NAME
----
-git-rerere - Reuse recorded resolve
+git-rerere - Reuse recorded resolution of conflicted merges
SYNOPSIS
--------
This resets the metadata used by rerere if a merge resolution is to be
is aborted. Calling gitlink:git-am[1] --skip or gitlink:git-rebase[1]
-[--skip|--abort] will automatcally invoke this command.
+[--skip|--abort] will automatically invoke this command.
'diff'::