diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-01-14 23:10:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-01-15 00:14:29 (GMT) |
| commit | 11c57e6a9a0f31f970701a673adaa1826f502fa0 (patch) | |
| tree | a699e3ad06fcac5cebd98e89051fe0201196964a /Documentation/git-rerere.txt | |
| parent | e87e22d0f22eb262a90e76197465d6cfd9707ea1 (diff) | |
| download | git-11c57e6a9a0f31f970701a673adaa1826f502fa0.zip git-11c57e6a9a0f31f970701a673adaa1826f502fa0.tar.gz git-11c57e6a9a0f31f970701a673adaa1826f502fa0.tar.bz2 | |
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/git-rerere.txt')
| -rw-r--r-- | Documentation/git-rerere.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt index 3793267..a53858e 100644 --- a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -22,6 +22,10 @@ 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 configuration variable rerere.enabled to +enable this command. + COMMANDS -------- |