From: jidanni@jidanni.org
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH] Documentation/merge-strategies.txt, diff-options: grammar
Date: Tue, 6 Jan 2009 11:52:36 +0800 [thread overview]
Message-ID: <1231213956-14929-1-git-send-email-jidanni@jidanni.org> (raw)
Signed-off-by: jidanni <jidanni@jidanni.org>
---
Documentation/diff-options.txt | 4 ++--
Documentation/merge-strategies.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index b432d25..9cd162f 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -143,11 +143,11 @@ endif::git-format-patch[]
that matches other criteria, nothing is selected.
--find-copies-harder::
- For performance reasons, by default, `-C` option finds copies only
+ For performance reasons, by default, the `-C` option finds copies only
if the original file of the copy was modified in the same
changeset. This flag makes the command
inspect unmodified files as candidates for the source of
- copy. This is a very expensive operation for large
+ the copy. This is a very expensive operation for large
projects, so use it with caution. Giving more than one
`-C` option has the same effect.
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index 1276f85..3cef90a 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -11,7 +11,7 @@ resolve::
recursive::
This can only resolve two heads using 3-way merge
algorithm. When there are more than one common
- ancestors that can be used for 3-way merge, it creates a
+ ancestor that can be used for 3-way merge, it creates a
merged tree of the common ancestors and uses that as
the reference tree for the 3-way merge. This has been
reported to result in fewer merge conflicts without
--
1.6.0.6
next reply other threads:[~2009-01-06 3:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-06 3:52 jidanni [this message]
2009-01-06 8:44 ` [PATCH] Documentation/merge-strategies.txt, diff-options: grammar Thomas Rast
2009-01-06 9:38 ` Jeff King
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=1231213956-14929-1-git-send-email-jidanni@jidanni.org \
--to=jidanni@jidanni.org \
--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).