git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: usbuser@mailbox.org
To: git@vger.kernel.org
Subject: Unexpected or wrong ff, no-ff and ff-only behaviour
Date: Tue, 9 Jul 2019 11:42:51 +0200 (CEST)	[thread overview]
Message-ID: <423596682.8516.1562665372094@office.mailbox.org> (raw)

Hello,

I'm rather confused about --ff, --no-ff and --ff-only. They seam to be all mutual exclusive while the man page documentation and help reads as if only the first two are mutual exclusive, while the later is a check that can be enabled additionally to the former ones. I'm not sure why I couldn't find anything online about this issue.

The expected behaviour would be that a git merge --ff-only --no-ff only accepts merges where HEAD is up to date and generates then a merge commit. The observed behaviour is that a merge with conflict / non up to data HEAD is entered. If the two flags are swapped it can be observed that no merge commit is created and the branch is fast forwarded.

Sincerely,
eyenseo

             reply	other threads:[~2019-07-09  9:43 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-09  9:42 usbuser [this message]
2019-07-09 14:51 ` Unexpected or wrong ff, no-ff and ff-only behaviour Junio C Hamano
2019-07-09 16:15   ` Roland Jäger
2019-07-09 16:35     ` Elijah Newren
2019-07-09 17:00       ` usbuser
2019-07-09 20:33         ` Elijah Newren
2019-07-09 20:51           ` Bryan Turner
2019-07-10  7:49             ` usbuser
2019-07-10 16:34             ` Junio C Hamano
2019-07-11  5:13               ` Sergey Organov
2019-07-11 17:03                 ` Junio C Hamano
2019-07-12 13:50                   ` Sergey Organov
2019-07-12 16:24                     ` Elijah Newren
2019-07-15 12:08                       ` Sergey Organov
2019-07-12 18:33                     ` Junio C Hamano
2019-07-15 12:47                       ` Sergey Organov
2019-07-15 16:57                         ` Junio C Hamano
2019-07-19 11:00                           ` Sergey Organov
2019-07-11 15:46             ` brian m. carlson
2019-07-10 14:36       ` Sergey Organov

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=423596682.8516.1562665372094@office.mailbox.org \
    --to=usbuser@mailbox.org \
    --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).