From: Junio C Hamano <gitster@pobox•com>
To: Sergey Organov <sorganov@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [RFC/PATCH] git-merge: implement --ff-only-merge option.
Date: Tue, 07 Oct 2014 11:37:46 -0700 [thread overview]
Message-ID: <xmqqzjd7enet.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1412699710-3480-1-git-send-email-sorganov@gmail.com> (Sergey Organov's message of "Tue, 7 Oct 2014 20:35:10 +0400")
Sergey Organov <sorganov@gmail•com> writes:
> This option allows to create merge commit when fast-forward is
> possible, and abort otherwise. I.e. it's equivalent to --ff-only,
> except that it finally creates merge commit instead of
> fast-forwarding.
>
> One may also consider this option to be equivalent to --no-ff with
> additional check that the command without --no-ff would indeed result
> in fast-forward.
>
> Useful to incorporate topic branch as single merge commit, ensuring
> the left-side of the merge has no changes (our-diff-empty-merge).
>
> Signed-off-by: Sergey Organov <sorganov@gmail•com>
> ---
The workflow this implements sounds like "because we can", not
"because it will help us do X and Y and Z". Why would it be useful
to limit the history to a shape where all merges are the ones that
could have been fast-forwarded?
I cannot justify that sensibly myself, which in turn makes the
feature smell to me that it is encouraging a wrong workflow.
next prev parent reply other threads:[~2014-10-07 18:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-07 16:35 [RFC/PATCH] git-merge: implement --ff-only-merge option Sergey Organov
2014-10-07 18:37 ` Junio C Hamano [this message]
2014-10-07 20:24 ` Sergey Organov
2014-10-07 20:27 ` Junio C Hamano
2014-10-07 20:42 ` Sergey Organov
2014-10-07 21:38 ` Junio C Hamano
2014-10-08 10:02 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzjd7enet.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=sorganov@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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