From: Elijah Newren Date: Wed, 27 Jun 2018 07:46:00 GMT Subject: [PATCH v2] git-rebase--merge: modernize "git-$cmd" to "git $cmd" Message-ID: <20180627074600.32149-1-newren@gmail.com> In-Reply-To: <20180607050615.19598-1-newren@gmail.com> Signed-off-by: Elijah Newren --- Changes since v1: - Fixed up commit message (move below comment to below diffstat as originally intended) Long term I just want to make git-rebase--merge go away, so this patch will eventually be obsoleted. But since I'm waiting for multiple topics to merge down before re-submitting that series, and since that series has some open questions as well, I figure it's worth (re-)submitting this simple fix in the mean time. git-rebase--merge.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-rebase--merge.sh b/git-rebase--merge.sh index cf4c042214..aa2f2f0872 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 } -- 2.18.0.9.g431b2c36d5