diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-01-14 15:10:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-14 16:14:29 -0800 |
| commit | 11c57e6a9a0f31f970701a673adaa1826f502fa0 (patch) | |
| tree | a699e3ad06fcac5cebd98e89051fe0201196964a /Documentation/config.txt | |
| parent | e87e22d0f22eb262a90e76197465d6cfd9707ea1 (diff) | |
| download | git-11c57e6a9a0f31f970701a673adaa1826f502fa0.tar.gz git-11c57e6a9a0f31f970701a673adaa1826f502fa0.tar.xz | |
Fix git-rerere documentation
rerere.enabled is _not_ on by default. The command is enabled if rr-cache
exists even when rerere.enabled is missing, and enabled or disabled by
explicitly setting the rerere.enabled variable.
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index df091d1b8..877eda960 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -543,8 +543,8 @@ rerere.enabled:: Activate recording of resolved conflicts, so that identical conflict hunks can be resolved automatically, should they be encountered again. linkgit:git-rerere[1] command is by - default enabled, but can be disabled by setting this option to - false. + default enabled if you create `rr-cache` directory under + `$GIT_DIR`, but can be disabled by setting this option to false. gitcvs.enabled:: Whether the CVS server interface is enabled for this repository. |