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

Re: Fast-forward-only merge

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Jul 24, 2009, 10:40 UTC
Message-ID
<4A698F80.2020801@drmicha.warpmail.net>
In-Reply-To
<82ws5y4dfs.fsf@mid.bfk.de>
Florian Weimer venit, vidit, dixit 24.07.2009 11:50:
> Is there an easy way to require that "git merge" succeeds only if the
> merge is fast-forward?
>

There's an easy way to test before the merge (git merge-base), but an option for git merge is still missing:

http://article.gmane.org/gmane.comp.version-control.git/76787 http://article.gmane.org/gmane.comp.version-control.git/80284 http://article.gmane.org/gmane.comp.version-control.git/107768 http://article.gmane.org/gmane.comp.version-control.git/118529

Cheers, Michael

Previous: Florian Weimer
Message 2 of 2 in “Fast-forward-only merge”
  1. Florian WeimerJul 24, 2009
  2. Michael J GruberJul 24, 2009

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.