Re: git-merge --no-commit commits

From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Dec 2, 2007, 17:18 UTC
Message-ID: <19f34abd0712020918w1640389kb0ca006b2051a678@mail.gmail.com>
In-Reply-To: <m3bq99vx7t.fsf@roke.D-201>

On Dec 2, 2007 6:10 PM, Jakub Narebski <jnareb@gmail.com> wrote:

Show 19 quoted lines

> "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
>

Yes. Thanks. Isn't that counter-intuitive, though? The manpage says that it lets you review the changes first. I assumed this would include fast-forwarding as well. There is no --no-ff in my git-merge manpage. Maybe I need a newer version?

Show 6 quoted lines

> HTH
> --
> Jakub Narebski
> ShadeHawk on #git
> Poland
>

Vegard