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

Q: What happened to "--no-commit" merges?

From
UWUlrich Windl <ulrich.windl@rz.uni-regensburg.de>
Date
Jan 22, 2019, 20:55 UTC
Message-ID
<5C47833C020000A10002F499@gwsmtp1.uni-regensburg.de>
Hi!

Using git version 2.16.4 on OpenSUSE Leap 15.0, it seems that "--no-commit" no longer does what it did before (AFAIR, but I mostly did --no-ff merges in SLES11): Like this (sorry German):

> git merge --no-commit local/f-linux-firefox 
Aktualisiere 520aaae..c11e3da
Fast-forward
 bin/fval.xsl | 133 +++++++++++++++++++++++++----------------------------------
 1 file changed, 57 insertions(+), 76 deletions(-)
> git status

Auf Branch f-linux-firefox nichts zu committen, Arbeitsverzeichnis unverändert

### "nothing to commit" git log indicates the changes were committed already

Reading https://stackoverflow.com/questions/8640887/git-merge-without-auto-commit it seems that without "--no-ff" this ioption is effectively ignored. If so, I suggest to tell the user that --no-commit is useless in this case, and let him confirm that he/she wants the changes (merge) to be committed (despite of --no-commit).

Regards, Ulrich

Next: Elijah Newren
Message 1 of 11 in “Q: What happened to "--no-commit" merges?”
  1. Ulrich WindlJan 22, 2019
  2. Elijah NewrenJan 22, 2019
  3. Antw: Re: Q: What happened to "--no-commit" merges?Ulrich Windl, Jan 23, 2019
  4. Elijah Newren, Feb 18, 2019
  5. Antw: Antw:Ulrich Windl, Feb 19, 2019
  6. merge-options.txt: correct wording of --no-commit optionElijah Newren, Feb 19, 2019
  7. Junio C HamanoFeb 19, 2019
  8. Elijah NewrenFeb 19, 2019
  9. Junio C HamanoFeb 19, 2019
  10. merge-options.txt: correct wording of --no-commit optionElijah Newren, Feb 21, 2019
  11. Antw: Re: [PATCH v2] merge-options.txt: correct wording of --no-commit optionUlrich Windl, Feb 20, 2019

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.