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

Re: [PATCH] Add --ff-only flag to git-merge

From
Sverre Rabbelier <srabbelier@gmail.com>
Date
Jan 28, 2009, 14:35 UTC
Message-ID
<bd6139dc0901280635q6b6d538axede045de121f72b6@mail.gmail.com>
In-Reply-To
<1233147238-30082-1-git-send-email-nothingmuch@woobling.org>
On Wed, Jan 28, 2009 at 13:53, Yuval Kogman <nothingmuch@woobling.org> wrote:
> This patch adds an --ff-only flag to git-merge. When specified git-merge
> will exit with an error whenver a merge will not be a simple fast
> forward, similar to the default behavior of git push.

I like! This calls for a new alias 'git config alias.integrate "merge --no-ff"', thanks! *hopes this hits next soon*

-- 
Cheers,

Sverre Rabbelier
Previous: Yuval KogmanNext: Junio C Hamano
Message 4 of 9 in “Add --ff-only flag to git-merge”
  1. Add --ff-only flag to git-mergeYuval Kogman, Jan 28, 2009
  2. Johannes SchindelinJan 28, 2009
  3. Yuval KogmanJan 28, 2009
  4. Sverre RabbelierJan 28, 2009
  5. Junio C HamanoJan 28, 2009
  6. Yuval KogmanJan 29, 2009
  7. Junio C HamanoJan 29, 2009
  8. Add --ff-only flag to git-merge (take 2)Yuval Kogman, Jan 30, 2009
  9. Add --ff-only flag to git-mergeYuval Kogman, Jan 30, 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.