We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 0060041 commit d7f590bCopy full SHA for d7f590b
git-rebase--merge.sh
@@ -71,7 +71,7 @@ call_merge () {
71
test -z "$strategy" && strategy=recursive
72
# If cmt doesn't have a parent, don't include it as a base
73
base=$(git rev-parse --verify --quiet $cmt^)
74
- eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
+ eval 'git merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
75
rv=$?
76
case "$rv" in
77
0)
@@ -88,7 +88,7 @@ call_merge () {
88
;;
89
*)
90
die "Unknown exit code ($rv) from command:" \
91
- "git-merge-$strategy $cmt^ -- HEAD $cmt"
+ "git merge-$strategy $cmt^ -- HEAD $cmt"
92
93
esac
94
}
0 commit comments