From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Jun 2013 20:58:26 GMT
Subject: Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull
Message-ID: <7vmwqbqnil.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130627203007.GG9999@odin.tremily.us>

"W. Trevor King" <wking@tremily.us> writes:

> Assorted minor edits:
>
> On Thu, Jun 27, 2013 at 12:48:52PM -0700, Junio C Hamano wrote:
>> Because letting a trivial merge automatically handled by Git is so
>
> Maybe:
>
>   Because letting Git handle a trivial merge automatically is so…
>
>> that the project s/he is interacting with may prefer "rebase"
>> workflow.  Add a safety valve to fail "git pull" that is not a
>
> Maybe (adding an "a"):
>
>   a "rebase" workflow.

Thanks.