index a53858e2503f52b68739264f026c6532ba733d1f..d712f62c5f8f02561992119f5dd2bcd4c6b2902d 100644 (file)
SYNOPSIS
--------
-'git-rerere' [clear|diff|status|gc]
+'git rerere' [clear|diff|status|gc]
DESCRIPTION
-----------
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 linkgit:git[7] suite
+Part of the linkgit:git[1] suite