diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-18 21:20:33 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 21:20:33 +0200 |
| commit | b345b77b3a10dc94c2130669ce27bf61eddaabee (patch) | |
| tree | a56cd02df9e9473611617cb2a4646975478932a0 /git-rebase.sh | |
| parent | Merge branch 'mb/filter-branch-optim' (diff) | |
| parent | git-rebase--merge: modernize "git-$cmd" to "git $cmd" (diff) | |
| download | git-b345b77b3a10dc94c2130669ce27bf61eddaabee.tar.xz git-b345b77b3a10dc94c2130669ce27bf61eddaabee.zip | |
Merge branch 'en/rebase-i-microfixes'
* en/rebase-i-microfixes:
git-rebase--merge: modernize "git-$cmd" to "git $cmd"
Fix use of strategy options with interactive rebases
t3418: add testcase showing problems with rebase -i and strategy options
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 19bdebb480..f3b10c7f62 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -328,7 +328,7 @@ do do_merge=t ;; --strategy-option=*) - strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--${1#--strategy-option=}")" + strategy_opts="$strategy_opts $(git rev-parse --sq-quote "--${1#--strategy-option=}" | sed -e s/^.//)" do_merge=t test -z "$strategy" && strategy=recursive ;; |