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>
This commit is contained in:
Junio C Hamano
2009-12-04 00:20:48 -08:00
parent 1a56be134f
commit cb6020bb01
12 changed files with 76 additions and 17 deletions

View File

@ -50,6 +50,7 @@ diffstat=$(git config --bool rebase.stat)
git_am_opt=
rebase_root=
force_rebase=
allow_rerere_autoupdate=
continue_merge () {
test -n "$prev_head" || die "prev_head must be defined"
@ -118,7 +119,7 @@ call_merge () {
return
;;
1)
git rerere
git rerere $allow_rerere_autoupdate
die "$RESOLVEMSG"
;;
2)
@ -349,6 +350,9 @@ do
-f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase)
force_rebase=t
;;
--rerere-autoupdate|--no-rerere-autoupdate)
allow_rerere_autoupdate="$1"
;;
-*)
usage
;;