From: "Horst H. von Brand" <vonbrand@inf.utfsm.cl>
To: git@vger.kernel.org, gitster@pobox.com
Cc: "Horst H. von Brand" <vonbrand@inf.utfsm.cl>
Subject: [PATCH] git-pull.sh: Fix call to git-merge for new command format
Date: Tue, 1 Dec 2009 19:44:11 -0300 [thread overview]
Message-ID: <1259707451-20661-1-git-send-email-vonbrand@inf.utfsm.cl> (raw)
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
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
next reply other threads:[~2009-12-01 23:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-01 22:44 Horst H. von Brand [this message]
2009-12-01 23:54 ` [PATCH] git-pull.sh: Fix call to git-merge for new command format Junio C Hamano
2009-12-02 10:02 ` Michael J Gruber
2009-12-02 16:45 ` Junio C Hamano
2009-12-02 17:29 ` Michael J Gruber
2009-12-02 17:49 ` Junio C Hamano
2009-12-03 8:10 ` Michael J Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1259707451-20661-1-git-send-email-vonbrand@inf.utfsm.cl \
--to=vonbrand@inf.utfsm.cl \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).