diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-01-10 15:57:27 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-10 12:59:31 -0800 |
| commit | b6fb7fed6afca3376e4cdd70c9fe9737bcd73a6e (patch) | |
| tree | c74c3d77f0ff8a79b85458b9c2b45bda8698de80 /Documentation | |
| parent | attr.c: clarify the logic to pop attr_stack (diff) | |
| download | tgif-b6fb7fed6afca3376e4cdd70c9fe9737bcd73a6e.tar.xz | |
Documentation: rerere's rr-cache auto-creation and rerere.enabled
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 18ab1ae65e..27b57d226b 100644 --- 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 |