From c0ecb07048ce2123589a2f077d296e8cf29a9570 Mon Sep 17 00:00:00 2001 From: "Horst H. von Brand" Date: Tue, 1 Dec 2009 19:44:11 -0300 Subject: [PATCH] git-pull.sh: Fix call to git-merge for new command format Now "git merge HEAD" is officially deprecated, we should clean our own use as well. Signed-off-by: Horst H. von Brand Signed-off-by: Junio C Hamano --- git-pull.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index bfeb4a0ff6..502af1a9c4 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -216,7 +216,7 @@ fi merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit test true = "$rebase" && - exec git-rebase $diffstat $strategy_args --onto $merge_head \ + exec git rebase $diffstat $strategy_args --onto $merge_head \ ${oldremoteref:-$merge_head} -exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \ - "$merge_name" HEAD $merge_head $verbosity +exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \ + -m "$merge_name" $merge_head -- 2.11.4.GIT