summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* contacts: fix to work in subdirectorieses/contacts-in-subdirEric Sunshine2013-09-171-0/+4
* Merge branch 'es/contacts-blame-L-multi'Junio C Hamano2013-09-091-9/+22
|\
| * contacts: reduce git-blame invocationses/contacts-blame-L-multiEric Sunshine2013-08-131-6/+5
| * contacts: gather all blame sources prior to invoking git-blameEric Sunshine2013-08-131-5/+20
| * contacts: validate hunk length earlierEric Sunshine2013-08-131-3/+2
* | Merge branch 'jc/url-match'Junio C Hamano2013-09-0924-24/+1072
|\ \
| * | builtin/config.c: compilation fixJunio C Hamano2013-08-092-4/+4
| * | config: "git config --get-urlmatch" parses section.<url>.keyJunio C Hamano2013-08-053-0/+152
| * | builtin/config: refactor collect_config()Junio C Hamano2013-08-051-21/+21
| * | config: parse http.<url>.<variable> using urlmatchKyle J. McKay2013-08-0519-1/+309
| * | config: add generic callback wrapper to parse section.<url>.keyJunio C Hamano2013-07-312-0/+85
| * | config: add helper to normalize and match URLsKyle J. McKay2013-07-312-0/+504
| * | http.c: fix parsing of http.sslCertPasswordProtected variableJunio C Hamano2013-07-311-2/+1
* | | Merge branch 'jl/submodule-mv'Junio C Hamano2013-09-0962-881/+1891
|\ \ \
| * | | rm: delete .gitmodules entry of submodules removed from the work treeJens Lehmann2013-08-067-25/+154
| * | | mv: update the path entry in .gitmodules for moved submodulesJens Lehmann2013-08-065-1/+121
| * | | submodule.c: add .gitmodules staging helper functionsJens Lehmann2013-07-302-0/+53
| * | | mv: move submodules using a gitfileJens Lehmann2013-07-305-5/+73
| * | | mv: move submodules together with their work treesJens Lehmann2013-07-302-47/+86
| * | | rm: do not set a variable twice without intermediate reading.Stefan Beller2013-07-231-1/+0
| * | | t6131 - skip tests if on case-insensitive file systemMark Levedahl2013-07-171-0/+6
| * | | parse_pathspec: accept :(icase)path syntaxNguyễn Thái Ngọc Duy2013-07-1511-28/+257
| * | | pathspec: support :(glob) syntaxNguyễn Thái Ngọc Duy2013-07-1512-31/+198
| * | | pathspec: make --literal-pathspecs disable pathspec magicNguyễn Thái Ngọc Duy2013-07-153-3/+9
| * | | pathspec: support :(literal) syntax for noglob pathspecNguyễn Thái Ngọc Duy2013-07-159-15/+64
| * | | kill limit_pathspec_to_literal() as it's only used by parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-153-12/+6
| * | | parse_pathspec: preserve prefix length via PATHSPEC_PREFIX_ORIGINNguyễn Thái Ngọc Duy2013-07-151-5/+36
| * | | parse_pathspec: make sure the prefix part is wildcard-freeNguyễn Thái Ngọc Duy2013-07-155-10/+54
| * | | rename field "raw" to "_raw" in struct pathspecNguyễn Thái Ngọc Duy2013-07-154-7/+7
| * | | tree-diff: remove the use of pathspec's raw[] in follow-rename codepathNguyễn Thái Ngọc Duy2013-07-151-2/+2
| * | | remove match_pathspec() in favor of match_pathspec_depth()Nguyễn Thái Ngọc Duy2013-07-156-140/+25
| * | | remove init_pathspec() in favor of parse_pathspec()Nguyễn Thái Ngọc Duy2013-07-1510-81/+21
| * | | remove diff_tree_{setup,release}_pathsNguyễn Thái Ngọc Duy2013-07-157-32/+22
| * | | convert common_prefix() to use struct pathspecNguyễn Thái Ngọc Duy2013-07-154-19/+18
| * | | convert add_files_to_cache to take struct pathspecNguyễn Thái Ngọc Duy2013-07-153-6/+9
| * | | convert {read,fill}_directory to take struct pathspecNguyễn Thái Ngọc Duy2013-07-157-12/+20
| * | | convert refresh_index to take struct pathspecNguyễn Thái Ngọc Duy2013-07-155-13/+13
| * | | convert report_path_error to take struct pathspecNguyễn Thái Ngọc Duy2013-07-154-18/+19
| * | | checkout: convert read_tree_some to take struct pathspecNguyễn Thái Ngọc Duy2013-07-153-9/+6
| * | | convert unmerge_cache to take struct pathspecNguyễn Thái Ngọc Duy2013-07-153-4/+4
| * | | convert run_add_interactive to use struct pathspecNguyễn Thái Ngọc Duy2013-07-154-26/+19
| * | | convert read_cache_preload() to take struct pathspecNguyễn Thái Ngọc Duy2013-07-157-17/+19
| * | | line-log: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-1/+1
| * | | reset: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-10/+16
| * | | add: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-152-101/+45
| * | | check-ignore: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-154-18/+32
| * | | archive: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-152-9/+14
| * | | ls-files: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-33/+13
| * | | rm: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-12/+12
| * | | checkout: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-151-13/+21