git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Horst H. von Brand" <vonbrand@inf.utfsm.cl>
To: gitster@pobox.com
Cc: git@vger.kernel.org, "Horst H. von Brand" <vonbrand@inf.utfsm.cl>
Subject: [PATCH 2/4] RelNotes 1.8.1: Awkward wording
Date: Fri, 16 Nov 2012 10:05:51 -0300	[thread overview]
Message-ID: <1353071153-1453-2-git-send-email-vonbrand@inf.utfsm.cl> (raw)
In-Reply-To: <1353071153-1453-1-git-send-email-vonbrand@inf.utfsm.cl>

From: "Horst H. von Brand" <vonbrand@inf.utfsm.cl>

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
---
 Documentation/RelNotes/1.8.1.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/RelNotes/1.8.1.txt b/Documentation/RelNotes/1.8.1.txt
index 559cd05..69baa35 100644
--- a/Documentation/RelNotes/1.8.1.txt
+++ b/Documentation/RelNotes/1.8.1.txt
@@ -100,7 +100,7 @@ details).
 
  * "git mergetool" feeds /dev/null as a common ancestor when dealing
    with an add/add conflict, but p4merge backend cannot handle
-   it. Work it around by passing a temporary empty file.
+   it. Work around this by passing a temporary empty file.
    (merge 3facc60 da/mergetools-p4 later to maint).
 
  * "git log -F -E --grep='<ere>'" failed to use the given <ere>
-- 
1.8.0.197.g5a90748

  reply	other threads:[~2012-11-16 13:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-16 13:05 [PATCH 1/4] RelNotes 1.8.1: Typo Horst H. von Brand
2012-11-16 13:05 ` Horst H. von Brand [this message]
2012-11-16 13:05 ` [PATCH 3/4] RelNotes 1.8.1: Grammar thinko Horst H. von Brand
2012-11-16 13:05 ` [PATCH 4/4] RelNotes 1.8.1: Another grammar thinko Horst H. von Brand

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=1353071153-1453-2-git-send-email-vonbrand@inf.utfsm.cl \
    --to=vonbrand@inf.utfsm.cl \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).