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

Fast-forward-only merge

From
FWFlorian Weimer <fweimer@bfk.de>
Date
Jul 24, 2009, 09:50 UTC
Message-ID
<82ws5y4dfs.fsf@mid.bfk.de>

Is there an easy way to require that "git merge" succeeds only if the merge is fast-forward?

-- 
Florian Weimer                <fweimer@bfk.de>
BFK edv-consulting GmbH       http://www.bfk.de/
Kriegsstraße 100              tel: +49-721-96201-1
D-76133 Karlsruhe             fax: +49-721-96201-99
Next: Michael J Gruber
Message 1 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.