summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* completion: clone can recurse into submodulessb/submodule-default-pathsStefan Beller2016-06-201-0/+2
* clone: add --init-submodule=<pathspec> switchStefan Beller2016-06-203-9/+131
* submodule update: add `--init-default-path` switchStefan Beller2016-06-204-7/+89
* Merge branch 'sb/pathspec-label' into sb/submodule-default-pathsJunio C Hamano2016-06-207-39/+451
|\
| * pathspec: disable preload-index when attribute pathspec magic is in usesb/pathspec-labelJunio C Hamano2016-06-033-0/+18
| * pathspec: allow escaped query valuesStefan Beller2016-06-032-5/+58
| * pathspec: allow querying for attributesStefan Beller2016-05-255-4/+334
| * pathspec: move prefix check out of the inner loopStefan Beller2016-05-251-9/+10
| * pathspec: move long magic parsing out of prefix_pathspecStefan Beller2016-05-251-37/+47
| * Documentation: fix a typoStefan Beller2016-05-251-1/+1
* | Merge branch 'jc/attr' into sb/submodule-default-pathsJunio C Hamano2016-06-2013-230/+354
|\ \ | |/
| * attr: support quoting pathname patterns in C stylejc/attrNguyễn Thái Ngọc Duy2016-05-253-5/+44
| * attr: expose validity check for attribute namesJunio C Hamano2016-05-252-14/+28
| * attr: add counted string version of git_attr()Junio C Hamano2016-05-252-5/+8
| * attr: add counted string version of git_check_attr()Junio C Hamano2016-05-252-9/+15
| * attr: retire git_check_attrs() APIJunio C Hamano2016-05-253-31/+56
| * attr: convert git_check_attrs() callers to use the new APIJunio C Hamano2016-05-255-68/+40
| * attr: convert git_all_attrs() to use "struct git_attr_check"Junio C Hamano2016-05-253-52/+80
| * attr: (re)introduce git_check_attr() and struct git_attr_checkJunio C Hamano2016-05-253-18/+49
| * attr: rename function and struct related to checking attributesJunio C Hamano2016-05-259-41/+42
| * attr.c: plug small leak in parse_attr_line()Junio C Hamano2016-05-251-4/+8
| * attr.c: tighten constness around "git_attr" structureJunio C Hamano2016-05-172-3/+3
| * attr.c: simplify macroexpand_one()Junio C Hamano2016-05-161-7/+4
| * attr.c: mark where #if DEBUG ends more clearlyJunio C Hamano2016-05-161-1/+1
| * attr.c: complete a sentence in a commentJunio C Hamano2016-05-161-1/+1
| * attr.c: explain the lack of attr-name syntax check in parse_attr()Junio C Hamano2016-05-161-0/+6
| * attr.c: update a stale comment on "struct match_attr"Junio C Hamano2016-05-161-3/+2
| * attr.c: use strchrnul() to scan for one lineJunio C Hamano2016-05-161-2/+2
| * commit.c: use strchrnul() to scan for one lineJunio C Hamano2016-05-161-2/+1
* | Start the post-2.9 cycleJunio C Hamano2016-06-203-2/+70
* | Merge branch 'rs/xdiff-hunk-with-func-line'Junio C Hamano2016-06-2010-93/+365
|\ \
| * | xdiff: fix merging of appended hunk with -Wrs/xdiff-hunk-with-func-lineRené Scharfe2016-06-092-2/+25
| * | grep: -W: don't extend context to trailing empty linesRené Scharfe2016-05-312-3/+27
| * | t7810: add test for grep -W and trailing empty context linesRené Scharfe2016-05-311-3/+16
| * | xdiff: don't trim common tail with -WRené Scharfe2016-05-312-7/+5
| * | xdiff: -W: don't include common trailing empty lines in contextRené Scharfe2016-05-312-2/+4
| * | xdiff: ignore empty lines before added functions with -WRené Scharfe2016-05-312-3/+21
| * | xdiff: handle appended chunks better with -WRené Scharfe2016-05-312-4/+25
| * | xdiff: factor out match_func_rec()René Scharfe2016-05-311-4/+11
| * | t4051: rewrite, add more testsRené Scharfe2016-05-316-74/+240
* | | Merge branch 'jk/rev-list-count-with-bitmap'Junio C Hamano2016-06-202-1/+11
|\ \ \
| * | | rev-list: disable bitmaps when "-n" is used with listing objectsjk/rev-list-count-with-bitmapJeff King2016-06-031-1/+2
| * | | rev-list: "adjust" results of "--count --use-bitmap-index -n"Jeff King2016-06-032-0/+9
* | | | Merge branch 'wd/userdiff-css'Junio C Hamano2016-06-2015-0/+90
|\ \ \ \
| * | | | userdiff: add built-in pattern for CSSwd/userdiff-cssWilliam Duclot2016-06-0315-0/+90
* | | | | Merge branch 'jc/clear-pathspec'Junio C Hamano2016-06-2010-15/+15
|\ \ \ \ \
| * | | | | pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspecJunio C Hamano2016-06-0210-15/+15
* | | | | | Merge branch 'aq/upload-pack-use-parse-options'Junio C Hamano2016-06-202-36/+37
|\ \ \ \ \ \
| * | | | | | upload-pack.c: use parse-options APIaq/upload-pack-use-parse-optionsAntoine Queru2016-05-312-36/+37
* | | | | | | Merge branch 'jg/dash-is-last-branch-in-worktree-add'Junio C Hamano2016-06-203-1/+21
|\ \ \ \ \ \ \
View Lorry Controller Status