Skip to content

Commit ed43af2

Browse files
dschoGit for Windows Build Agent
authored andcommitted
rebase--merge: avoid dashed invocation
We deprecated the dashed invocations ages ago. Might just as well hold ourselves to that. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 3e68d9b commit ed43af2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-rebase--merge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ call_merge () {
6969
test -z "$strategy" && strategy=recursive
7070
# If cmt doesn't have a parent, don't include it as a base
7171
base=$(git rev-parse --verify --quiet $cmt^)
72-
eval 'git-merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
72+
eval 'git merge-$strategy' $strategy_opts $base ' -- "$hd" "$cmt"'
7373
rv=$?
7474
case "$rv" in
7575
0)

0 commit comments

Comments
 (0)