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

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

From
Yuval Kogman <nothingmuch@woobling.org>
Date
Jan 28, 2009, 13:29 UTC
Message-ID
<a891e1bd0901280529v296914bdod8f33a1db4846c47@mail.gmail.com>
In-Reply-To
<alpine.DEB.1.00.0901281425180.3586@pacific.mpi-cbg.de>
2009/1/28 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
> If you compare the two if() lines, you will see that you mixed style.
Thanks,
I will be fixing it here:
http://github.com/nothingmuch/git/tree/ff-only

before I send a new version, as I likely screwed up many things, not just that =)

Previous: Johannes SchindelinNext: Sverre Rabbelier
Message 3 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.