summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-23 03:18:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-23 03:18:37 (GMT)
commitbc38219f50ba9228945fba8e900d636f15082f16 (patch)
tree06e090679892d927c141aac808b37a49de52466e /builtin
parent3776ea9d7006f48c380e80ccc57db681f4e9adfb (diff)
parent22e5e58a3c75b73764b860907e4d871195f276ac (diff)
downloadgit-bc38219f50ba9228945fba8e900d636f15082f16.zip
git-bc38219f50ba9228945fba8e900d636f15082f16.tar.gz
git-bc38219f50ba9228945fba8e900d636f15082f16.tar.bz2
Merge branch 'maint'
* maint: Typos in code comments, an error message, documentation
Diffstat (limited to 'builtin')
-rw-r--r--builtin/blame.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 437b1a4..1015354 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2368,11 +2368,11 @@ parse_done:
*
* The remaining are:
*
- * (1) if dashdash_pos != 0, its either
+ * (1) if dashdash_pos != 0, it is either
* "blame [revisions] -- <path>" or
* "blame -- <path> <rev>"
*
- * (2) otherwise, its one of the two:
+ * (2) otherwise, it is one of the two:
* "blame [revisions] <path>"
* "blame <path> <rev>"
*