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>
Horst H. von Brand committed
Dec 1, 2009 at 19:44 UTC
c0ecb07048ce2123589a2f077d296e8cf29a9570
1 file changed
+3
-3
git-pull.sh
+3
-3
@@ -216,7 +216,7 @@ fi
216
217
merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit
218
test true = "$rebase" &&
219
- exec git-rebase $diffstat $strategy_args --onto $merge_head \
219
+ exec git rebase $diffstat $strategy_args --onto $merge_head \
220
${oldremoteref:-$merge_head}
221
-exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
222
- "$merge_name" HEAD $merge_head $verbosity
221
+exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \
222
+ -m "$merge_name" $merge_head