From: "Vegard Nossum" <vegard.nossum@gmail.com>
To: git@vger.kernel.org
Subject: git-merge --no-commit commits
Date: Sun, 2 Dec 2007 17:57:38 +0100 [thread overview]
Message-ID: <19f34abd0712020857m757c57cfr358a81e47f38fac8@mail.gmail.com> (raw)
Hi,
I am using git 1.5.3.4 and just did the following (v1 and v2 are
branches; v1 is a parent of v2):
git checkout v1
git merge --no-commit v2
It simply fast-forwarded AND committed even though I explicitly told
it not to. What gives?
Kind regards,
Vegard Nossum
next reply other threads:[~2007-12-02 16:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-02 16:57 Vegard Nossum [this message]
2007-12-02 17:10 ` git-merge --no-commit commits Jakub Narebski
2007-12-02 17:18 ` Vegard Nossum
2007-12-02 18:00 ` Jakub Narebski
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=19f34abd0712020857m757c57cfr358a81e47f38fac8@mail.gmail.com \
--to=vegard.nossum@gmail.com \
--cc=git@vger.kernel.org \
/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).