From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 29 Feb 2020 16:33:08 GMT
Subject: Re: [PATCH] pull: warn if the user didn't say whether to rebase or to merge
Message-ID: <xmqq7e05cq0r.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20200229030344.GG101220@mit.edu>

"Theodore Y. Ts'o" <tytso@mit.edu> writes:

> 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.

Thanks for raising this.