git-rebase--merge: modernize "git-$cmd" to "git $cmd"
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Jun 27, 2018 at 00:46 UTC
d7f590be8409363afad51519d3060188d33fb775
1 file changed
+2
-2
git-rebase--merge.sh
+2
-2
@@ -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"'
74
+ 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"
91
+ "git merge-$strategy $cmt^ -- HEAD $cmt"
92
;;
93
esac
94
}