From: Christoph Paulik <cpaulik@gmail.com>
To: git@vger.kernel.org
Subject: git merge branch --no-commit does commit fast forward merges
Date: Sun, 17 Apr 2016 23:10:51 +0200 [thread overview]
Message-ID: <874mb0kkkk.fsf@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 688 bytes --]
Hi Git Mailinglist,
git merge branch --no-commit does commit fast forward merges
leaving users no way to change the merge results. The command only
works as expected when also adding the --no-ff flag. Looking at
the help text of the --no-commit flag I think that this might be a
unintended.
I've tested this on git 2.8.0.
This bug was first reported to magit
(https://github.com/magit/magit/issues/2620) whose maintainer then
suggested that it might be a git bug.
Best regards,
Christoph
--
-------------------------------------------------------
Christoph Paulik
Twitter, Github: @cpaulik
PGP: 8CFC D7DF 2867 B2DC 749B 1B0A 6E3B A262 5186 A0AC
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
next reply other threads:[~2016-04-17 21:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-17 21:10 Christoph Paulik [this message]
2016-04-17 23:52 ` git merge branch --no-commit does commit fast forward merges Jacob Keller
2016-04-18 6:26 ` Johannes Schindelin
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=874mb0kkkk.fsf@gmail.com \
--to=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.