From: Andreas Schwab <schwab@linux-m68k.org>
To: Domenico Andreoli <cavokz@gmail.com>
Cc: Dan Johnson <computerdruid@gmail.com>, git@vger.kernel.org
Subject: Re: Merging tags does not fast-forward with git 1.7.9
Date: Thu, 09 Feb 2012 17:30:21 +0100 [thread overview]
Message-ID: <m2aa4synoi.fsf@igel.home> (raw)
In-Reply-To: <20120209160419.GA28718@glitch> (Domenico Andreoli's message of "Thu, 9 Feb 2012 17:04:19 +0100")
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."
next prev parent reply other threads:[~2012-02-09 16:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 9:54 Merging tags does not fast-forward with git 1.7.9 Domenico Andreoli
2012-02-09 15:50 ` Dan Johnson
2012-02-09 16:04 ` Domenico Andreoli
2012-02-09 16:30 ` Andreas Schwab [this message]
2012-02-09 16:06 ` Carlos Martín Nieto
2012-02-09 16:18 ` Domenico Andreoli
2012-02-09 18:05 ` Junio C Hamano
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=m2aa4synoi.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=cavokz@gmail.com \
--cc=computerdruid@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).