Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jn/add-2.0-u-A-sans-pathspec' | Junio C Hamano | 2014-03-07 | 1 | -7/+2 |
|\ | |||||
| * | git add: -u/-A now affects the entire working treejn/add-2.0-u-A-sans-pathspec | Junio C Hamano | 2013-04-26 | 1 | -7/+2 |
* | | Merge branch 'jk/run-network-tests-by-default' | Junio C Hamano | 2014-03-05 | 3 | -14/+74 |
|\ \ | |||||
| * | | tests: turn on network daemon tests by defaultjk/run-network-tests-by-default | Jeff King | 2014-02-14 | 3 | -14/+74 |
* | | | Merge branch 'nd/daemonize-gc' | Junio C Hamano | 2014-03-05 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | gc: config option for running --auto in background | Nguyễn Thái Ngọc Duy | 2014-02-10 | 1 | -0/+1 |
* | | | | Merge branch 'ks/combine-diff' | Junio C Hamano | 2014-03-05 | 2 | -0/+127 |
|\ \ \ \ | |||||
| * | | | | tests: add checking that combine-diff emits only correct pathsks/combine-diff | Kirill Smelkov | 2014-02-24 | 1 | -0/+106 |
| * | | | | diff test: add tests for combine-diff with orderfile | Kirill Smelkov | 2014-02-24 | 1 | -0/+21 |
* | | | | | Merge branch 'nd/http-fetch-shallow-fix' | Junio C Hamano | 2014-02-27 | 6 | -27/+82 |
|\ \ \ \ \ | |||||
| * | | | | | t5537: move http tests out to t5539nd/http-fetch-shallow-fix | Nguyễn Thái Ngọc Duy | 2014-02-13 | 2 | -57/+82 |
| * | | | | | fetch-pack: fix deepen shallow over smart http with no-done cap | Nguyễn Thái Ngọc Duy | 2014-02-10 | 1 | -0/+30 |
| * | | | | | test: rename http fetch and push test files | Nguyễn Thái Ngọc Duy | 2014-02-10 | 4 | -0/+0 |
* | | | | | | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-02-27 | 2 | -0/+196 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pack-bitmap: implement optional name_hash cache | Vicent Marti | 2013-12-30 | 2 | -2/+4 |
| * | | | | | | t/perf: add tests for pack bitmaps | Jeff King | 2013-12-30 | 1 | -0/+56 |
| * | | | | | | t: add basic bitmap functionality tests | Jeff King | 2013-12-30 | 1 | -0/+138 |
* | | | | | | | Merge branch 'jk/test-ports' | Junio C Hamano | 2014-02-27 | 10 | -10/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tests: auto-set git-daemon portjk/test-ports | Jeff King | 2014-02-10 | 2 | -2/+1 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | tests: auto-set LIB_HTTPD_PORT from test name | Jeff King | 2014-02-10 | 8 | -8/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'nd/reset-intent-to-add' | Junio C Hamano | 2014-02-27 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | reset: support "--mixed --intent-to-add" modend/reset-intent-to-add | Nguyễn Thái Ngọc Duy | 2014-02-05 | 1 | -0/+15 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'mw/symlinks' | Junio C Hamano | 2014-02-27 | 2 | -0/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | setup: don't dereference in-tree symlinks for absolute paths | Martin Erik Werner | 2014-02-04 | 2 | -2/+2 |
| * | | | | | | t0060: add tests for prefix_path when path begins with work tree | Martin Erik Werner | 2014-02-04 | 1 | -0/+10 |
| * | | | | | | t0060: add test for prefix_path when path == work tree | Martin Erik Werner | 2014-02-04 | 1 | -0/+6 |
| * | | | | | | t0060: add test for prefix_path on symlinks via absolute paths | Martin Erik Werner | 2014-02-04 | 1 | -0/+5 |
| * | | | | | | t3004: add test for ls-files on symlinks via absolute paths | Junio C Hamano | 2014-02-04 | 1 | -0/+17 |
* | | | | | | | Merge branch 'nd/test-rename-reset' | Junio C Hamano | 2014-02-27 | 2 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7101, t7014: rename test files to indicate what that file is fornd/test-rename-reset | Nguyễn Thái Ngọc Duy | 2014-02-04 | 2 | -0/+0 |
* | | | | | | | | Merge branch 'wk/submodule-on-branch' | Junio C Hamano | 2014-02-27 | 1 | -1/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | submodule: explicit local branch creation in module_clone | W. Trevor King | 2014-02-24 | 1 | -1/+38 |
* | | | | | | | | | Merge branch 'nd/diff-quiet-stat-dirty' | Junio C Hamano | 2014-02-27 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | diff: do not quit early on stat-dirty filesnd/diff-quiet-stat-dirty | Nguyễn Thái Ngọc Duy | 2014-02-24 | 1 | -0/+6 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash' | Junio C Hamano | 2014-02-27 | 2 | -3/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | pathspec: pass directory indicator to match_pathspec_item() | Nguyễn Thái Ngọc Duy | 2014-02-24 | 1 | -0/+6 |
| * | | | | | | | | | pathspec: rename match_pathspec_depth() to match_pathspec() | Nguyễn Thái Ngọc Duy | 2014-02-24 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive' | Junio C Hamano | 2014-02-27 | 1 | -0/+47 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursive | Brad King | 2014-02-24 | 1 | -1/+1 |
| * | | | | | | | | | | t3030-merge-recursive: test known breakage with empty work tree | Brad King | 2014-02-24 | 1 | -0/+47 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'da/pull-ff-configuration' | Junio C Hamano | 2014-02-27 | 1 | -0/+21 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pull: add pull.ff configuration | David Aguilar | 2014-01-15 | 1 | -0/+21 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'kb/fast-hashmap' | Junio C Hamano | 2014-02-27 | 1 | -0/+240 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add a hashtable implementation that supports O(1) removal | Karsten Blees | 2013-11-18 | 1 | -0/+240 |
* | | | | | | | | | | | Merge branch 'nv/commit-gpgsign-config' | Junio C Hamano | 2014-02-27 | 1 | -4/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | test the commit.gpgsign config optionnv/commit-gpgsign-config | Nicolas Vigier | 2014-02-24 | 1 | -4/+21 |
* | | | | | | | | | | | Merge branch 'aj/ada-diff-word-pattern' | Junio C Hamano | 2014-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | userdiff: update Ada patternsaj/ada-diff-word-pattern | Adrian Johnson | 2014-02-05 | 1 | -1/+1 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'jn/pager-lv-default-env' | Junio C Hamano | 2014-01-31 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | pager test: make fake pager consume all its inputjn/pager-lv-default-env | Jonathan Nieder | 2014-01-31 | 1 | -1/+1 |