Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-format-patch.txt: document --no-notes option
[gitweb.git]
/
Documentation
/
git-rerere.txt
diff --git
a/Documentation/git-rerere.txt
b/Documentation/git-rerere.txt
index df310d2a58cc6c30dfa6d2d8609149fbcf17ecca..95763d7581579f5e20d063e5b6cba20f8a6d59cf 100644
(file)
--- a/
Documentation/git-rerere.txt
+++ b/
Documentation/git-rerere.txt
@@
-24,7
+24,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
in order to
+You need to set the configuration variable
`rerere.enabled`
in order to
enable this command.