From: Sergey Organov <sorganov@gmail•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org
Subject: Re: [RFC/PATCH] git-merge: implement --ff-only-merge option.
Date: Wed, 08 Oct 2014 00:42:25 +0400 [thread overview]
Message-ID: <87a957obm6.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqqegujeibx.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Tue, 07 Oct 2014 13:27:30 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> 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?
Yes, and I already said it's close. But I don't want such merge commit
to contain any non-trivialities. Currently I check it manually before
issuing "merge --no-ff" and was hoping for some automation.
>
>> 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?
Why? What is wrong about it?
Please also notice that I don't try to impose this on anybody who does
consider it wrong workflow.
--
Sergey.
next prev parent reply other threads:[~2014-10-07 20:42 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
2014-10-07 20:42 ` Sergey Organov [this message]
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=87a957obm6.fsf@osv.gnss.ru \
--to=sorganov@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(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