Skip to content

Commit d7f590b

Browse files
newrengitster
authored andcommitted
git-rebase--merge: modernize "git-$cmd" to "git $cmd"
Signed-off-by: Elijah Newren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0060041 commit d7f590b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-rebase--merge.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ call_merge () {
7171
test -z "$strategy" && strategy=recursive
7272
# If cmt doesn't have a parent, don't include it as a base
7373
base=$(git rev-parse --verify --quiet $cmt^)
74-
eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
74+
eval 'git merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
7575
rv=$?
7676
case "$rv" in
7777
0)
@@ -88,7 +88,7 @@ call_merge () {
8888
;;
8989
*)
9090
die "Unknown exit code ($rv) from command:" \
91-
"git-merge-$strategy $cmt^ -- HEAD $cmt"
91+
"git merge-$strategy $cmt^ -- HEAD $cmt"
9292
;;
9393
esac
9494
}

0 commit comments

Comments
 (0)