[PATCH] git-pull.sh: Fix call to git-merge for new command format
From: Horst H. von Brand <hidden>
Date: 2016-06-15 22:47:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Horst H. von Brand <redacted> --- git-pull.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index bfeb4a0..a875809 100755
--- a/git-pull.sh
+++ b/git-pull.sh@@ -218,5 +218,5 @@ 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 \ ${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 -m $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \ + "$merge_name" $merge_head
--
1.6.6.rc0.114.gc8648