diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-07-18 19:20:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 19:20:33 (GMT) |
| commit | b345b77b3a10dc94c2130669ce27bf61eddaabee (patch) | |
| tree | a56cd02df9e9473611617cb2a4646975478932a0 /git-rebase--merge.sh | |
| parent | 676c7e50b10f1fbb2ce06e46260f15f3a20679f7 (diff) | |
| parent | d7f590be8409363afad51519d3060188d33fb775 (diff) | |
| download | git-b345b77b3a10dc94c2130669ce27bf61eddaabee.zip git-b345b77b3a10dc94c2130669ce27bf61eddaabee.tar.gz git-b345b77b3a10dc94c2130669ce27bf61eddaabee.tar.bz2 | |
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--merge.sh')
| -rw-r--r-- | git-rebase--merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index cf4c042..aa2f2f0 100644 --- a/git-rebase--merge.sh +++ b/git-rebase--merge.sh @@ -71,7 +71,7 @@ call_merge () { test -z "$strategy" && strategy=recursive # If cmt doesn't have a parent, don't include it as a base base=$(git rev-parse --verify --quiet $cmt^) - eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"' + eval 'git merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"' rv=$? case "$rv" in 0) @@ -88,7 +88,7 @@ call_merge () { ;; *) die "Unknown exit code ($rv) from command:" \ - "git-merge-$strategy $cmt^ -- HEAD $cmt" + "git merge-$strategy $cmt^ -- HEAD $cmt" ;; esac } |