From: Elijah Newren <newren@gmail.com>
Date: Wed, 27 Jun 2018 07:46:00 +0000 (-0700)
Subject: git-rebase--merge: modernize "git-$cmd" to "git $cmd"
X-Git-Tag: v2.19.0-rc0~151^2
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=d7f590be8409363afad51519d3060188d33fb775;p=git.git

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>
---

diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh
index ceb715453c..96bec9c767 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
 }