From: Jakub Narebski <jnareb@gmail.com>
To: "Vegard Nossum" <vegard.nossum@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git-merge --no-commit commits
Date: Sun, 02 Dec 2007 09:10:51 -0800 (PST) [thread overview]
Message-ID: <m3bq99vx7t.fsf@roke.D-201> (raw)
In-Reply-To: <19f34abd0712020857m757c57cfr358a81e47f38fac8@mail.gmail.com>
"Vegard Nossum" <vegard.nossum@gmail.com> writes:
> 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?
The --no-commit option doesn't prevent fast-forward because
fast-forward doesn't really _create_ a commit (and -no-commit is
really about commit creation). It just advanced ref (branch head).
You probably wanted to use
$ git merge --no-commit --no-ff v2
HTH
--
Jakub Narebski
ShadeHawk on #git
Poland
next prev parent reply other threads:[~2007-12-02 17:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-02 16:57 git-merge --no-commit commits Vegard Nossum
2007-12-02 17:10 ` Jakub Narebski [this message]
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=m3bq99vx7t.fsf@roke.D-201 \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=vegard.nossum@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.