diff options
Diffstat (limited to 'git-rebase--interactive.sh')
| -rw-r--r-- | git-rebase--interactive.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 08e9a21c2f..6367da66e2 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -57,7 +57,6 @@ init_basic_state () { rm -f "$(git rev-parse --git-path REBASE_HEAD)" : > "$state_dir"/interactive || die "$(gettext "Could not mark as interactive")" - write_basic_state } git_rebase__interactive () { @@ -70,6 +69,12 @@ git_rebase__interactive () { git rebase--helper --prepare-branch "$switch_to" ${verbose:+--verbose} init_basic_state + git rebase--helper --init-basic-state ${upstream:+--upstream "$upstream"} \ + ${onto:+--onto "$onto"} ${head_name:+--head-name "$head_name"} \ + ${verbose:+--verbose} ${strategy:+--strategy "$strategy"} \ + ${strategy_opts:+--strategy-opts="$strategy_opts"} \ + "$allow_rerere_autoupdate" "$gpg_sign_opt" "$signoff" || exit + git rebase--helper --make-script ${keep_empty:+--keep-empty} \ ${rebase_merges:+--rebase-merges} \ ${rebase_cousins:+--rebase-cousins} \ |