From: W. Trevor King <wking@tremily.us>
Date: Thu, 27 Jun 2013 20:30:07 GMT
Subject: Re: [PATCH] pull: require choice between rebase/merge on non-fast-forward pull
Message-ID: <20130627203007.GG9999@odin.tremily.us>
In-Reply-To: <7v4ncjs5az.fsf_-_@alter.siamese.dyndns.org>

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.

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy