Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: rerere's rr-cache auto-creation and rerere.enabled
author
Junio C Hamano
<gitster@pobox.com>
Tue, 10 Jan 2012 14:57:27 +0000
(15:57 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 10 Jan 2012 20:59:31 +0000
(12:59 -0800)
The description of rerere.enabled left the user in the dark as to who
might create an rr-cache directory. Add a note that simply invoking
rerere does this.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
c432ef9
)
diff --git
a/Documentation/config.txt
b/Documentation/config.txt
index 18ab1ae65e5ff74073941e3a3d8d62891250629f..27b57d226bc15e6246875fe5a8ae00df533c1c9d 100644
(file)
--- a/
Documentation/config.txt
+++ b/
Documentation/config.txt
@@
-1703,7
+1703,8
@@
rerere.enabled::
conflict hunks can be resolved automatically, should they be
encountered again. By default, linkgit:git-rerere[1] is
enabled if there is an `rr-cache` directory under the
- `$GIT_DIR`.
+ `$GIT_DIR`, e.g. if "rerere" was previously used in the
+ repository.
sendemail.identity::
A configuration identity. When given, causes values in the