Teach --[no-]rerere-autoupdate option to merge, revert and friends
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Dec 2009 08:20:48 +0000 (00:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Dec 2009 08:20:48 +0000 (00:20 -0800)
commitcb6020b...017405cc3e7f1faea6f30d4fd1b62e70
treee03a7af...1884d2b4f8f1e45ee6a945baebd95806copy hash to clipboard (tree)
parent1a56be1...4f9477296a7ade040e8b802bf3a643a1copy hash to clipboard (diff)
12 files changed:
Documentation/git-merge.txt
builtin-commit.c
builtin-merge.c
builtin-rerere.c
builtin-revert.c
git-am.sh
git-rebase.sh
parse-options.c
parse-options.h
rerere.c
rerere.h
t/t4200-rerere.sh