![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 4 Dec 2009 08:20:48 +0000 (00:20 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 4 Dec 2009 08:20:48 +0000 (00:20 -0800) | ||
| commit | cb6020bb017405cc3e7f1faea6f30d4fd1b62e70 | |
| tree | e03a7afb1884d2b4f8f1e45ee6a945baebd95806 | tree | snapshot |
| parent | 1a56be134f9477296a7ade040e8b802bf3a643a1 | commit | 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>
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 | history | |
| builtin-commit.c | diff | blob | history | |
| builtin-merge.c | diff | blob | history | |
| builtin-rerere.c | diff | blob | history | |
| builtin-revert.c | diff | blob | history | |
| git-am.sh | diff | blob | history | |
| git-rebase.sh | diff | blob | history | |
| parse-options.c | diff | blob | history | |
| parse-options.h | diff | blob | history | |
| rerere.c | diff | blob | history | |
| rerere.h | diff | blob | history | |
| t/t4200-rerere.sh | diff | blob | history |