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

merge ignores --no-commit in fast-forward case

From
Tomas Carnecky <tom@dbservice.com>
Date
Sep 13, 2009, 06:40 UTC
Message-ID
<A754ACF1-77C2-4036-A15C-8949E76BD2D5@dbservice.com>
Bug or feature?
Three possible solutions that I see:
  2) Refuse to do anything if user gives --no-commit and merge is fast- 
forward
  3) Document this behavior in the manpage
  4) Quietly set deny_non_fast_forward when --no-commit was given

A fourth solution would be to not change anything, but users usually have a reason for using --no-commit, and if git commits behind their backs anyway that's just not nice.

tom
Next: Junio C Hamano
Message 1 of 6 in “merge ignores --no-commit in fast-forward case”
  1. Tomas CarneckySep 13, 2009
  2. Junio C HamanoSep 13, 2009
  3. Greg PriceSep 18, 2009
  4. Junio C HamanoSep 18, 2009
  5. Paolo BonziniSep 20, 2009
  6. Björn SteinbrinkSep 19, 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.