summaryrefslogtreecommitdiff
path: root/Documentation/git-patch-id.txt
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2009-03-25 18:23:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-26 00:28:33 (GMT)
commit4fa535a179e771cd5a16d5ab05e97e7bb52739ef (patch)
tree8d304c37da17dc14a356b2e460b69fd012353386 /Documentation/git-patch-id.txt
parent98e1a4186acd4b71da1daae5c522cb6ac6d1d904 (diff)
downloadgit-4fa535a179e771cd5a16d5ab05e97e7bb52739ef.zip
git-4fa535a179e771cd5a16d5ab05e97e7bb52739ef.tar.gz
git-4fa535a179e771cd5a16d5ab05e97e7bb52739ef.tar.bz2
Grammar fixes to "merge" and "patch-id" docs
Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-patch-id.txt')
-rw-r--r--Documentation/git-patch-id.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt
index 477785e..253fc0f 100644
--- a/Documentation/git-patch-id.txt
+++ b/Documentation/git-patch-id.txt
@@ -20,7 +20,7 @@ IOW, you can use this thing to look for likely duplicate commits.
When dealing with 'git-diff-tree' output, it takes advantage of
the fact that the patch is prefixed with the object name of the
-commit, and outputs two 40-byte hexadecimal string. The first
+commit, and outputs two 40-byte hexadecimal strings. The first
string is the patch ID, and the second string is the commit ID.
This can be used to make a mapping from patch ID to commit ID.