summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHorst H. von Brand <vonbrand@inf.utfsm.cl>2009-12-01 22:44:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-02 18:42:48 (GMT)
commitc0ecb07048ce2123589a2f077d296e8cf29a9570 (patch)
treeec46d292ece6c4fa1a6d9f943eba2b51841f5d9d
parent0748494e866041034605aaf177f29a61bdc25951 (diff)
downloadgit-c0ecb07048ce2123589a2f077d296e8cf29a9570.zip
git-c0ecb07048ce2123589a2f077d296e8cf29a9570.tar.gz
git-c0ecb07048ce2123589a2f077d296e8cf29a9570.tar.bz2
git-pull.sh: Fix call to git-merge for new command format
Now "git merge <msg> HEAD" is officially deprecated, we should clean our own use as well. Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-pull.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-pull.sh b/git-pull.sh
index bfeb4a0..502af1a 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