rebase -m: remember allow_rerere_autoupdate option

diff --git a/git-rebase.sh b/git-rebase.sh
index 8a36e7a86162839b7afb9b9cd45745da6e95f8e2..be9ec2a1f79cc8d61e7255a1609577fc7c2c29f2 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -81,6 +81,11 @@ read_basic_state () {
        fi &&
        GIT_QUIET=$(cat "$state_dir"/quiet) &&
        test -f "$state_dir"/verbose && verbose=t
+       test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)"
+       test -f "$state_dir"/strategy_opts &&
+               strategy_opts="$(cat "$state_dir"/strategy_opts)"
+       test -f "$state_dir"/allow_rerere_autoupdate &&
+               allow_rerere_autoupdate="$(cat "$state_dir"/allow_rerere_autoupdate)"
 }
 
 write_basic_state () {
@@ -89,6 +94,11 @@ write_basic_state () {
        echo "$orig_head" > "$state_dir"/orig-head &&
        echo "$GIT_QUIET" > "$state_dir"/quiet &&
        test t = "$verbose" && : > "$state_dir"/verbose
+       test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy
+       test -n "$strategy_opts" && echo "$strategy_opts" > \
+               "$state_dir"/strategy_opts
+       test -n "$allow_rerere_autoupdate" && echo "$allow_rerere_autoupdate" > \
+               "$state_dir"/allow_rerere_autoupdate
 }
 
 output () {