diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:34:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:34:01 -0800 |
| commit | a4a227a7259df19e22e45fc55b143107afadc00b (patch) | |
| tree | efe46c7f49c37aab815a0b3b0cc7eeb06d530af2 /pathspec.c | |
| parent | a5d56530e0788fa7ffcae129355ec1eb401621df (diff) | |
| parent | 68840cb5af52541cb3354cfa06f2df86ae6ea6f6 (diff) | |
| download | git-a4a227a7259df19e22e45fc55b143107afadc00b.tar.gz | |
Merge branch 'mi/typofixes' into maint
* mi/typofixes:
contrib: typofixes
Documentation/technical/http-protocol.txt: typofixes
typofixes: fix misspelt comments
Diffstat (limited to 'pathspec.c')
| -rw-r--r-- | pathspec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pathspec.c b/pathspec.c index 4cf2bd365a..87b3b82f1f 100644 --- a/pathspec.c +++ b/pathspec.c @@ -197,11 +197,11 @@ static unsigned prefix_pathspec(struct pathspec_item *item, magic |= short_magic; *p_short_magic = short_magic; - /* --noglob-pathspec adds :(literal) _unless_ :(glob) is specifed */ + /* --noglob-pathspec adds :(literal) _unless_ :(glob) is specified */ if (noglob_global && !(magic & PATHSPEC_GLOB)) global_magic |= PATHSPEC_LITERAL; - /* --glob-pathspec is overriden by :(literal) */ + /* --glob-pathspec is overridden by :(literal) */ if ((global_magic & PATHSPEC_GLOB) && (magic & PATHSPEC_LITERAL)) global_magic &= ~PATHSPEC_GLOB; |