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 14:38:03 -0700 [thread overview]
Message-ID: <xmqqwq8bd0hw.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <87a957obm6.fsf@osv.gnss.ru> (Sergey Organov's message of "Wed, 08 Oct 2014 00:42:25 +0400")
Sergey Organov <sorganov@gmail.com> writes:
>> Because rebasing immediately before is considered a bad manner,
>> i.e. encouraging a wrong workflow?
>
> Why? What is wrong about it?
Searching the kernel archive for messages that talks about "rebase"
and "pull-request" from Linus would tell us why it is frowned upon
in a prominent early adopter project of Git.
You destroy what you have been testing and replace it with an
untested one. If you merge, and if the result of the merge is
broken, at least you would have something that used to work at its
second parent (i.e. the tip of your topic).
> Please also notice that I don't try to impose this on anybody who does
> consider it wrong workflow.
I know ;-). I didn't say anything about "imposing", did I?
Having an option to make it easy to do something undesirable gives
people an excuse to say "See Git has this option to let me do that
easily, it is an officially sanctioned and encouraged workflow".
next prev parent reply other threads:[~2014-10-07 21:38 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
2014-10-07 21:38 ` Junio C Hamano [this message]
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=xmqqwq8bd0hw.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.