diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-08 21:12:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-08 21:12:41 -0700 |
| commit | f29d669a91b2c8f1c68c1f4fb10f03456a997fa8 (patch) | |
| tree | 676e520973774e96da3c7310c161a7b18cda1de3 | |
| parent | GIT 1.6.1.4 (diff) | |
| parent | dir.c: Fix two minor grammatical errors in comments (diff) | |
| download | tgif-f29d669a91b2c8f1c68c1f4fb10f03456a997fa8.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
dir.c: Fix two minor grammatical errors in comments
| -rw-r--r-- | dir.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -53,7 +53,7 @@ int common_prefix(const char **pathspec) } /* - * Does 'match' matches the given name? + * Does 'match' match the given name? * A match is found if * * (1) the 'match' string is leading directory of 'name', or @@ -287,7 +287,7 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen) dir->basebuf[baselen] = '\0'; } -/* Scan the list and let the last match determines the fate. +/* Scan the list and let the last match determine the fate. * Return 1 for exclude, 0 for include and -1 for undecided. */ static int excluded_1(const char *pathname, |