Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
disable t9119 for now.
[gitweb.git]
/
Documentation
/
git-rerere.txt
diff --git
a/Documentation/git-rerere.txt
b/Documentation/git-rerere.txt
index c4d4263238e5b7c6dff705de5d8552a577fc35d6..8ce492c8f2738275aa951f2fd98f1bcca16baee6 100644
(file)
--- a/
Documentation/git-rerere.txt
+++ b/
Documentation/git-rerere.txt
@@
-22,10
+22,6
@@
automerge results and corresponding hand-resolve results on the
initial manual merge, and later by noticing the same automerge
results and applying the previously recorded hand resolution.
-[NOTE]
-You need to set the config variable rerere.enabled to enable this
-command.
-
COMMANDS
--------