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 13:27:30 -0700 [thread overview]
Message-ID: <xmqqegujeibx.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <87fvezsk5k.fsf@osv.gnss.ru> (Sergey Organov's message of "Wed, 08 Oct 2014 00:24:23 +0400")
Sergey Organov <sorganov@gmail.com> writes:
>> Why would it be useful to limit the history to a shape where all
>> merges are the ones that could have been fast-forwarded?
>
> Except by true merge, how else can I express with git that 'n'
> consequitive commits constitute single logical change (being originally
> some topic branch)?
You are justifying --no-ff, aren't you?
> Moreover, as topic branches are usually rebased before merge anyway,
> why shouldn't I have simple capability to enforce it?
Because rebasing immediately before is considered a bad manner,
i.e. encouraging a wrong workflow?
next prev parent reply other threads:[~2014-10-07 20:27 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
2014-10-07 20:24 ` Sergey Organov
2014-10-07 20:27 ` Junio C Hamano [this message]
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=xmqqegujeibx.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sorganov@gmail.com \
/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.