git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: gitster@pobox.com, diane.gasselin@ensimag.imag.fr,
	vascomalmeida@sapo.pt, git@vger.kernel.org
Subject: Re: [PATCH] unpack-trees: fix English grammar in do-this-before-that messages
Date: Fri, 24 Jun 2016 11:26:31 +0200	[thread overview]
Message-ID: <vpqeg7nj5tk.fsf@anie.imag.fr> (raw)
In-Reply-To: <20160624053135.7848-1-alexhenrie24@gmail.com> (Alex Henrie's message of "Thu, 23 Jun 2016 23:31:35 -0600")

Alex Henrie <alexhenrie24@gmail.com> writes:

> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
>  unpack-trees.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/unpack-trees.c b/unpack-trees.c
> index 6bc9512..11c37fb 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
>  	if (!strcmp(cmd, "checkout"))
>  		msg = advice_commit_before_merge
>  		      ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
> -			  "Please commit your changes or stash them before you can switch branches.")
> +			  "Please commit your changes or stash them before you switch branches.")

I'm not a native speaker, but I think both versions are correct.

I'm OK with the change, though. Dropping something useless is usually a
good thing :-).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

  reply	other threads:[~2016-06-24  9:26 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-24  5:31 [PATCH] unpack-trees: fix English grammar in do-this-before-that messages Alex Henrie
2016-06-24  9:26 ` Matthieu Moy [this message]
2016-06-24 11:39 ` Vasco Almeida
2016-06-24 22:28   ` Junio C Hamano
2016-06-24 23:02     ` Vasco Almeida

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=vpqeg7nj5tk.fsf@anie.imag.fr \
    --to=matthieu.moy@grenoble-inp.fr \
    --cc=alexhenrie24@gmail.com \
    --cc=diane.gasselin@ensimag.imag.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=vascomalmeida@sapo.pt \
    /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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).