From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 09 Feb 2012 16:30:21 GMT
Subject: Re: Merging tags does not fast-forward with git 1.7.9
Message-ID: <m2aa4synoi.fsf@igel.home>
In-Reply-To: <20120209160419.GA28718@glitch>

Domenico Andreoli <cavokz@gmail.com> writes:

> This is Debian unstable, out-of-the-box git package 1.7.9-1.
>
> $ git reset --hard v3.3-rc2
> HEAD is now at 62aa2b5 Linux 3.3-rc2
> $ git merge --ff-only v3.3-rc3
> fatal: Not possible to fast-forward, aborting.
> $ 

Workaround:

$ git merge v3.3-rc3^{}
Updating 62aa2b5..d65b4e9
Fast-forward

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."