summaryrefslogtreecommitdiff
path: root/pathspec.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-03 11:41:33 -0800
committerJunio C Hamano <gitster@pobox.com>2013-12-03 11:41:33 -0800
commit144d84644fd3a2d0dc7be60766411970e82faf55 (patch)
treeca7216def53c6fcfecc5267b65262b4a591790e0 /pathspec.c
parent23ca729228ef633e8048ce18433dc4ec2f6f53a1 (diff)
parent68840cb5af52541cb3354cfa06f2df86ae6ea6f6 (diff)
downloadgit-144d84644fd3a2d0dc7be60766411970e82faf55.tar.gz
Merge branch 'mi/typofixes'
* mi/typofixes: contrib: typofixes Documentation/technical/http-protocol.txt: typofixes typofixes: fix misspelt comments
Diffstat (limited to 'pathspec.c')
-rw-r--r--pathspec.c4
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;