]> git.ipfire.org Git - thirdparty/git.git/commit - rerere.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1a56be1) | patch
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)
commitcb6020bb017405cc3e7f1faea6f30d4fd1b62e70
treee03a7afb1884d2b4f8f1e45ee6a945baebd95806tree | snapshot
parent1a56be134f9477296a7ade040e8b802bf3a643a1commit | diff
Teach --[no-]rerere-autoupdate option to merge, revert and friends

Introduce a command line option to override rerere.autoupdate configuration
variable to make it more useful.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
12 files changed:
Documentation/git-merge.txt diff | blob | blame | history
builtin-commit.c diff | blob | blame | history
builtin-merge.c diff | blob | blame | history
builtin-rerere.c diff | blob | blame | history
builtin-revert.c diff | blob | blame | history
git-am.sh diff | blob | blame | history
git-rebase.sh diff | blob | blame | history
parse-options.c diff | blob | blame | history
parse-options.h diff | blob | blame | history
rerere.c diff | blob | blame | history
rerere.h diff | blob | blame | history
t/t4200-rerere.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.