git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ulrich Windl" <Ulrich.Windl@rz.uni-regensburg.de>
To: <git@vger.kernel.org>
Subject: Q: What happened to "--no-commit" merges?
Date: Tue, 22 Jan 2019 21:55:24 +0100	[thread overview]
Message-ID: <5C47833C020000A10002F499@gwsmtp1.uni-regensburg.de> (raw)

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



             reply	other threads:[~2019-01-22 21:02 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-22 20:55 Ulrich Windl [this message]
2019-01-22 21:29 ` Q: What happened to "--no-commit" merges? Elijah Newren
2019-01-23  7:04   ` Antw: " Ulrich Windl
2019-02-18 18:41     ` Elijah Newren
     [not found]       ` <0A3130DD0200005B824A10E1@gwsmtp1.uni-regensburg.de>
2019-02-19  7:03         ` Antw: Antw: Ulrich Windl
2019-02-19 17:07           ` [PATCH v2] merge-options.txt: correct wording of --no-commit option Elijah Newren
2019-02-19 19:32             ` Junio C Hamano
2019-02-19 22:31               ` Elijah Newren
2019-02-19 22:38                 ` Junio C Hamano
     [not found]               ` <07106FB4020000CD824A10E1@gwsmtp1.uni-regensburg.de>
     [not found]                 ` <AC7679FC02000011B9FD70CF@gwsmtp1.uni-regensburg.de>
2019-02-20  7:29                   ` Antw: " Ulrich Windl
2019-02-21 17:50             ` [PATCH v3] " Elijah Newren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5C47833C020000A10002F499@gwsmtp1.uni-regensburg.de \
    --to=ulrich.windl@rz.uni-regensburg.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).