summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-18 18:13:01 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-18 18:13:01 -0800
commit4a88fb7ffc32bdfdfab2605430514d92aba25b8a (patch)
tree77d37de207313b760eb08c502be1ea98a18351e9 /git-rebase.sh
parent26b9f5cc99a35d4f678c2f565e48237fc9515444 (diff)
parentcb6020bb017405cc3e7f1faea6f30d4fd1b62e70 (diff)
downloadgit-4a88fb7ffc32bdfdfab2605430514d92aba25b8a.tar.gz
Merge branch 'jc/rerere'
* jc/rerere: Teach --[no-]rerere-autoupdate option to merge, revert and friends
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 3de0942c0f..eddc02875f 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -52,6 +52,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"
@@ -120,7 +121,7 @@ call_merge () {
return
;;
1)
- git rerere
+ git rerere $allow_rerere_autoupdate
die "$RESOLVEMSG"
;;
2)
@@ -351,6 +352,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
;;