From: "Randall S. Becker" <rsbecker@nexbridge.com>
To: "'Theodore Y. Ts'o'" <tytso@mit.edu>,
"'Junio C Hamano'" <gitster@pobox.com>
Cc: "'Alex Henrie'" <alexhenrie24@gmail.com>, <git@vger.kernel.org>,
<rcdailey.lists@gmail.com>, <newren@gmail.com>,
<annulen@yandex.ru>
Subject: RE: [PATCH] pull: warn if the user didn't say whether to rebase or to merge
Date: Sat, 29 Feb 2020 11:16:34 -0500 [thread overview]
Message-ID: <012801d5ef1b$a0167740$e04365c0$@nexbridge.com> (raw)
In-Reply-To: <20200229030344.GG101220@mit.edu>
On February 28, 2020 10:04 PM, Theodore Y. Ts'o wrote:
> To: Junio C Hamano <gitster@pobox.com>
> Cc: Alex Henrie <alexhenrie24@gmail.com>; git@vger.kernel.org;
> rcdailey.lists@gmail.com; newren@gmail.com; rsbecker@nexbridge.com;
> annulen@yandex.ru
> Subject: Re: [PATCH] pull: warn if the user didn't say whether to rebase
or to
> merge
>
> On Fri, Feb 28, 2020 at 03:16:01PM -0800, Junio C Hamano wrote:
> > > To
> > > avoid that situation, Git should require users to explicitly specify
> > > whether their primary workflow is a contributor/rebasing workflow or
> > > a maintainer/merging workflow.
> >
> > There is nothing Git "should" do. There are things we wish Git did,
> > and we give orders to the codebase to do so in our proposed log
> > message. Perhaps like:
>
> I'd also note that there are some workflows that assume that --rebase is
> *never* a good thing, even for contributors. We can decide whether we
> want to bias the git man page in favor of one workflow as opposed to
> another, for the sake of new git users, but I don't think it's accurate to
say
> (or even imply) that there are only two workflows:
> contributor/rebasing and maintainer/merging.
I second this sentiment. The repositories my community (outside my company)
has are typically large (3-5Gb of sources) with 10K-100K individual files.
They all use a */merging paradigm.
Randall
next prev parent reply other threads:[~2020-02-29 16:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-28 21:58 [PATCH] pull: warn if the user didn't say whether to rebase or to merge Alex Henrie
2020-02-28 23:16 ` Junio C Hamano
2020-02-29 3:03 ` Theodore Y. Ts'o
2020-02-29 16:16 ` Randall S. Becker [this message]
2020-02-29 16:33 ` Junio C Hamano
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='012801d5ef1b$a0167740$e04365c0$@nexbridge.com' \
--to=rsbecker@nexbridge.com \
--cc=alexhenrie24@gmail.com \
--cc=annulen@yandex.ru \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=rcdailey.lists@gmail.com \
--cc=tytso@mit.edu \
/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 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 NNTP newsgroup(s).