Q: What happened to "--no-commit" merges?
- From
- Ulrich 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