Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/color-escape-has-zero-width'
[gitweb.git]
/
Documentation
/
git-rerere.txt
diff --git
a/Documentation/git-rerere.txt
b/Documentation/git-rerere.txt
index a53c3cd35b8d6c8be27d90f64013b377d205f201..7dd515b8ccde701ccf5743f80b3b762813ea90c9 100644
(file)
--- a/
Documentation/git-rerere.txt
+++ b/
Documentation/git-rerere.txt
@@
-23,7
+23,7
@@
on the initial manual merge, and applying previously recorded
hand resolutions to their corresponding automerge results.
[NOTE]
-You need to set the configuration variable rerere.enabled to
+You need to set the configuration variable rerere.enabled
in order
to
enable this command.