summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/pack-bitmap'Junio C Hamano2014-02-272-0/+196
|\
| * pack-bitmap: implement optional name_hash cacheVicent Marti2013-12-302-2/+4
| * t/perf: add tests for pack bitmapsJeff King2013-12-301-0/+56
| * t: add basic bitmap functionality testsJeff King2013-12-301-0/+138
* | Merge branch 'jk/test-ports'Junio C Hamano2014-02-2710-10/+2
|\ \
| * | tests: auto-set git-daemon portjk/test-portsJeff King2014-02-102-2/+1
| * | tests: auto-set LIB_HTTPD_PORT from test nameJeff King2014-02-108-8/+1
* | | Merge branch 'nd/reset-intent-to-add'Junio C Hamano2014-02-271-0/+15
|\ \ \
| * | | reset: support "--mixed --intent-to-add" modend/reset-intent-to-addNguyễn Thái Ngọc Duy2014-02-051-0/+15
| |/ /
* | | Merge branch 'mw/symlinks'Junio C Hamano2014-02-272-0/+38
|\ \ \
| * | | setup: don't dereference in-tree symlinks for absolute pathsMartin Erik Werner2014-02-042-2/+2
| * | | t0060: add tests for prefix_path when path begins with work treeMartin Erik Werner2014-02-041-0/+10
| * | | t0060: add test for prefix_path when path == work treeMartin Erik Werner2014-02-041-0/+6
| * | | t0060: add test for prefix_path on symlinks via absolute pathsMartin Erik Werner2014-02-041-0/+5
| * | | t3004: add test for ls-files on symlinks via absolute pathsJunio C Hamano2014-02-041-0/+17
* | | | Merge branch 'nd/test-rename-reset'Junio C Hamano2014-02-272-0/+0
|\ \ \ \
| * | | | t7101, t7014: rename test files to indicate what that file is fornd/test-rename-resetNguyễn Thái Ngọc Duy2014-02-042-0/+0
* | | | | Merge branch 'wk/submodule-on-branch'Junio C Hamano2014-02-271-1/+37
|\ \ \ \ \
| * | | | | submodule: explicit local branch creation in module_cloneW. Trevor King2014-02-241-1/+38
* | | | | | Merge branch 'nd/diff-quiet-stat-dirty'Junio C Hamano2014-02-271-0/+6
|\ \ \ \ \ \
| * | | | | | diff: do not quit early on stat-dirty filesnd/diff-quiet-stat-dirtyNguyễn Thái Ngọc Duy2014-02-241-0/+6
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'nd/submodule-pathspec-ending-with-slash'Junio C Hamano2014-02-272-3/+9
|\ \ \ \ \ \
| * | | | | | pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy2014-02-241-0/+6
| * | | | | | pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy2014-02-241-3/+3
* | | | | | | Merge branch 'bk/refresh-missing-ok-in-merge-recursive'Junio C Hamano2014-02-271-0/+47
|\ \ \ \ \ \ \
| * | | | | | | merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursiveBrad King2014-02-241-1/+1
| * | | | | | | t3030-merge-recursive: test known breakage with empty work treeBrad King2014-02-241-0/+47
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'da/pull-ff-configuration'Junio C Hamano2014-02-271-0/+21
|\ \ \ \ \ \ \
| * | | | | | | pull: add pull.ff configurationDavid Aguilar2014-01-151-0/+21
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'kb/fast-hashmap'Junio C Hamano2014-02-271-0/+240
|\ \ \ \ \ \ \
| * | | | | | | add a hashtable implementation that supports O(1) removalKarsten Blees2013-11-181-0/+240
* | | | | | | | Merge branch 'nv/commit-gpgsign-config'Junio C Hamano2014-02-271-4/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | test the commit.gpgsign config optionnv/commit-gpgsign-configNicolas Vigier2014-02-241-4/+21
* | | | | | | | | Merge branch 'aj/ada-diff-word-pattern'Junio C Hamano2014-02-071-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | userdiff: update Ada patternsaj/ada-diff-word-patternAdrian Johnson2014-02-051-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jn/pager-lv-default-env'Junio C Hamano2014-01-311-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | pager test: make fake pager consume all its inputjn/pager-lv-default-envJonathan Nieder2014-01-311-1/+1
* | | | | | | | | Merge branch 'as/tree-walk-fix-aggressive-short-cut'Junio C Hamano2014-01-271-0/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tree_entry_interesting: match against all pathspecsas/tree-walk-fix-aggressive-short-cutAndy Spencer2014-01-271-0/+13
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/test-fixes'Junio C Hamano2014-01-272-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | t7700: do not use "touch" unnecessarilyjk/test-fixesJeff King2014-01-231-1/+1
| * | | | | | | | t7501: fix "empty commit" test with NO_PERLJeff King2014-01-231-0/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'nd/negative-pathspec'Junio C Hamano2014-01-271-0/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting()nd/negative-pathspecNguyễn Thái Ngọc Duy2014-01-231-0/+17
* | | | | | | | | Merge branch 'pw/git-p4'Junio C Hamano2014-01-278-37/+326
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git p4 test: examine behavior with locked (+l) filesPete Wyckoff2014-01-221-0/+145
| * | | | | | | | | git p4: handle files with wildcards when doing RCS scrubbingPete Wyckoff2014-01-221-0/+23
| * | | | | | | | | git p4 test: do not pollute /tmpPete Wyckoff2014-01-222-3/+11
| * | | | | | | | | git p4 test: run as user "author"Pete Wyckoff2014-01-222-25/+28
| * | | | | | | | | git p4 test: is_cli_file_writeable succeedsPete Wyckoff2014-01-221-1/+1
View Lorry Controller Status