From: Jakub Narebski <jnareb@gmail.com>
Date: Sun, 02 Dec 2007 17:10:51 GMT
Subject: Re: git-merge --no-commit commits
Message-ID: <m3bq99vx7t.fsf@roke.D-201>
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