summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* "log --author=me --grep=it" should find intersection, not unionJunio C Hamano2010-01-251-1/+9
* Merge branch 'tc/test-locate-httpd'Junio C Hamano2010-01-171-6/+24
|\
| * t/lib-http.sh: Restructure finding of default httpd locationTarmigan Casebolt2010-01-061-6/+24
* | Merge branch 'jh/commit-status'Junio C Hamano2010-01-171-0/+109
|\ \
| * | t7502: test commit.status, --status and --no-statusJunio C Hamano2010-01-131-0/+109
* | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'Junio C Hamano2010-01-171-0/+57
|\ \ \
| * | | checkout -m path: fix recreating conflictsJunio C Hamano2010-01-061-0/+57
* | | | Merge branch 'tc/clone-v-progress'Junio C Hamano2010-01-171-1/+2
|\ \ \ \
| * | | | clone: use --progress to force progress reportingTay Ray Chuan2009-12-281-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'tc/smart-http-restrict'Junio C Hamano2010-01-175-260/+349
|\ \ \ \
| * | | | Test t5560: Fix test when run with dashTarmigan Casebolt2010-01-151-5/+10
| * | | | Smart-http tests: Test http-backend without curl or a webserverTarmigan Casebolt2010-01-062-6/+25
| * | | | Smart-http tests: Break test t5560-http-backend into piecesTarmigan Casebolt2010-01-063-147/+173
| * | | | Smart-http tests: Improve coverage in test t5560Tarmigan Casebolt2010-01-061-11/+10
| * | | | Smart-http: check if repository is OK to export before serving itTarmigan Casebolt2010-01-062-2/+42
| |/ / /
* | | | Merge branch 'jk/run-command-use-shell'Junio C Hamano2010-01-173-3/+4
|\ \ \ \
| * | | | t4030, t4031: work around bogus MSYS bash path conversionJohannes Sixt2010-01-052-2/+2
| * | | | textconv: use shell to run helperJeff King2010-01-052-2/+2
| * | | | t0021: use $SHELL_PATH for the filter scriptJohannes Sixt2010-01-051-1/+2
| |/ / /
* | | | Merge branch 'sr/gfi-options'Junio C Hamano2010-01-171-0/+152
|\ \ \ \
| * | | | fast-import: add (non-)relative-marks featureSverre Rabbelier2009-12-051-0/+25
| * | | | fast-import: allow for multiple --import-marks= argumentsSverre Rabbelier2009-12-041-0/+22
| * | | | fast-import: test the new option commandSverre Rabbelier2009-12-041-1/+36
| * | | | fast-import: add feature commandSverre Rabbelier2009-12-041-0/+70
* | | | | Merge branch 'cc/reset-more'Junio C Hamano2010-01-161-10/+10
|\ \ \ \ \
| * | | | | t7111: fix bad HEAD in tests with unmerged entriesChristian Couder2010-01-161-10/+10
* | | | | | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-132-1/+131
|\ \ \ \ \ \
| * | | | | | rebase -i: teach --onto A...B syntaxNanako Shiraishi2010-01-071-0/+30
| * | | | | | rebase: fix --onto A...B parsing and add testsNanako Shiraishi2010-01-071-0/+75
| * | | | | | "checkout A...B" switches to the merge base between A and BJunio C Hamano2009-10-181-1/+26
* | | | | | | Merge branch 'cc/reset-more'Junio C Hamano2010-01-132-0/+296
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | t7111: check that reset options work as described in the tablesChristian Couder2010-01-091-0/+113
| * | | | | | "reset --merge": fix unmerged caseJunio C Hamano2010-01-031-9/+31
| * | | | | | reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer2010-01-031-5/+7
| * | | | | | reset: add a few tests for "git reset --merge"Christian Couder2009-12-301-0/+159
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'nd/sparse'Junio C Hamano2010-01-137-0/+581
|\ \ \ \ \ \
| * | | | | | t7002: test for not using external grep on skip-worktree pathsNguyễn Thái Ngọc Duy2010-01-061-0/+12
| * | | | | | t7002: set test prerequisite "external-grep" if supportedNguyễn Thái Ngọc Duy2010-01-061-0/+12
| * | | | | | commit: correctly respect skip-worktree bitNguyễn Thái Ngọc Duy2009-12-141-2/+2
| * | | | | | tests: rename duplicate t1009Jeff King2009-11-251-0/+0
| * | | | | | sparse checkout: inhibit empty worktreeNguyễn Thái Ngọc Duy2009-08-231-7/+3
| * | | | | | Add tests for sparse checkoutNguyễn Thái Ngọc Duy2009-08-231-0/+154
| * | | | | | Read .gitignore from index if it is skip-worktreeNguyễn Thái Ngọc Duy2009-08-232-0/+41
| * | | | | | Teach Git to respect skip-worktree bit (writing part)Nguyễn Thái Ngọc Duy2009-08-231-0/+146
| * | | | | | Teach Git to respect skip-worktree bit (reading part)Nguyễn Thái Ngọc Duy2009-08-231-0/+163
| * | | | | | Introduce "skip-worktree" bit in index, teach Git to get/set this bitNguyễn Thái Ngọc Duy2009-08-231-0/+57
* | | | | | | Merge branch 'maint'Junio C Hamano2010-01-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | remote-curl: Fix Accept header for smart HTTP connectionsShawn O. Pearce2010-01-121-1/+1
* | | | | | | | Merge branch 'jk/maint-1.6.5-reset-hard'Junio C Hamano2010-01-101-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | reset: unbreak hard resets with GIT_WORK_TREEJeff King2009-12-301-0/+6
View Lorry Controller Status