From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Christoph Paulik <cpaulik@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git merge branch --no-commit does commit fast forward merges
Date: Mon, 18 Apr 2016 08:26:57 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1604180825170.2967@virtualbox> (raw)
In-Reply-To: <874mb0kkkk.fsf@gmail.com>
Hi Christoph,
On Sun, 17 Apr 2016, Christoph Paulik wrote:
> git merge branch --no-commit does commit fast forward merges leaving
> users no way to change the merge results.
No, this is not a bug. Please note that a fast-forward does not perform a
commit at all (and therefore "does commit fast forward" is an inaccurate
description).
> The command only works as expected when also adding the --no-ff flag.
Then you need to fix your expectations ;-)
A fast-forward *avoids* committing altogether. In that light, the current
behavior is correct.
Ciao,
Johannes
next prev parent reply other threads:[~2016-04-18 6:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-17 21:10 git merge branch --no-commit does commit fast forward merges Christoph Paulik
2016-04-17 23:52 ` Jacob Keller
2016-04-18 6:26 ` Johannes Schindelin [this message]
2016-04-18 7:09 ` Andrew Ardill
2016-04-18 7:23 ` Christoph Paulik
2016-04-18 7:44 ` Andrew Ardill
2016-04-18 16:36 ` Junio C Hamano
2016-04-18 16:54 ` Junio C Hamano
2016-04-26 21:32 ` [PATCH 1/2] merge: do not contaminate option_commit with --squash Junio C Hamano
2016-04-27 6:46 ` Johannes Schindelin
2016-04-27 15:14 ` Junio C Hamano
2016-04-27 15:19 ` Johannes Schindelin
2016-04-26 21:37 ` [PATCH 2/2] merge: warn --no-commit merge when no new commit is created Junio C Hamano
2016-04-26 21:53 ` Stefan Beller
2016-04-26 22:00 ` Junio C Hamano
2016-04-27 1:39 ` Eric Sunshine
2016-04-27 5:57 ` Johannes Sixt
2016-04-27 6:50 ` Johannes Schindelin
2016-04-27 15:13 ` Junio C Hamano
2016-04-27 15:37 ` Johannes Schindelin
2016-04-27 16:02 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1604180825170.2967@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=cpaulik@gmail.com \
--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.
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 NNTP newsgroup(s).