Code

Enable "git rerere" by the config variable rerere.enabled
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Fri, 6 Jul 2007 12:05:59 +0000 (13:05 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sat, 7 Jul 2007 05:39:15 +0000 (22:39 -0700)
commitb4372ef136b0a5a2c1dbd88a11dd72b478d0e0a5
tree904accc21f5d15f6d6f49ba2dbe004072764c16a
parentb2493649fe41f8a0db48ff4e809ea53c8a304a61
Enable "git rerere" by the config variable rerere.enabled

Earlier, "git rerere" was enabled by creating the directory
.git/rr-cache.  That is definitely not in line with most other
features, which are enabled by a config variable.

So, check the config variable "rerere.enabled". If it is set
to "false" explicitely, do not activate rerere, even if
.git/rr-cache exists. This should help when you want to disable
rerere temporarily.

If "rerere.enabled" is not set at all, fall back to detection
of the directory .git/rr-cache.

[jc: with minimum tweaks]

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/config.txt
Documentation/git-rerere.txt
builtin-rerere.c
contrib/emacs/git.el
git-am.sh
git-commit.sh
git-merge.sh
git-rebase.sh
t/t4200-rerere.sh