index c4d4263238e5b7c6dff705de5d8552a577fc35d6..d712f62c5f8f02561992119f5dd2bcd4c6b2902d 100644 (file)
SYNOPSIS
--------
-'git-rerere' [clear|diff|status|gc]
+'git rerere' [clear|diff|status|gc]
DESCRIPTION
-----------
results and applying the previously recorded hand resolution.
[NOTE]
-You need to set the config variable rerere.enabled to enable this
-command.
+You need to set the configuration variable rerere.enabled to
+enable this command.
COMMANDS
'clear'::
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]
+is aborted. Calling linkgit:git-am[1] --skip or linkgit:git-rebase[1]
[--skip|--abort] will automatically invoke this command.
'diff'::
up-to-date even before your topic is ready to be sent upstream.
This would result in falling back to three-way merge, and it
would conflict the same way the test merge you resolved earlier.
-`git-rerere` is run by `git rebase` to help you resolve this
+`git-rerere` is run by `git-rebase` to help you resolve this
conflict.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite