git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Merging tags does not fast-forward with git 1.7.9

From
Andreas Schwab <schwab@linux-m68k.org>
Date
Feb 9, 2012, 16:30 UTC
Message-ID
<m2aa4synoi.fsf@igel.home>
In-Reply-To
<20120209160419.GA28718@glitch>
Domenico Andreoli <cavokz@gmail.com> writes:
Show 7 quoted lines
> 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."
Previous: Domenico AndreoliNext: Carlos Martín Nieto
Message 4 of 7 in “Merging tags does not fast-forward with git 1.7.9”
  1. Domenico AndreoliFeb 9, 2012
  2. Dan JohnsonFeb 9, 2012
  3. Domenico AndreoliFeb 9, 2012
  4. Andreas SchwabFeb 9, 2012
  5. Carlos Martín NietoFeb 9, 2012
  6. Domenico AndreoliFeb 9, 2012
  7. Junio C HamanoFeb 9, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.