summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | Merge branch 'nd/maint-remote-remove' into maintJunio C Hamano2012-09-202-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rt/maint-clone-single'Junio C Hamano2012-10-011-0/+156
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | clone --single: limit the fetch refspec to fetched branchRalf Thielow2012-09-201-0/+156
* | | | | | | | | | | | | | | | | Merge branch 'rr/maint-submodule-unknown-cmd'Junio C Hamano2012-09-291-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | submodule: if $command was not matched, don't parse other argsRamkumar Ramachandra2012-09-251-2/+2
* | | | | | | | | | | | | | | | | Merge branch 'jk/smart-http-switch'Junio C Hamano2012-09-291-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | remote-curl: let users turn off smart httpJeff King2012-09-211-0/+12
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'sp/maint-http-enable-gzip'Junio C Hamano2012-09-291-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Enable info/refs gzip decompression in HTTP clientShawn O. Pearce2012-09-201-1/+2
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'aw/rebase-i-edit-todo'Junio C Hamano2012-09-291-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | rebase -i: Add tests for "--edit-todo"Andrew Wong2012-09-171-0/+18
* | | | | | | | | | | | | | | | | Merge branch 'js/rebase-exec-command-not-found'Junio C Hamano2012-09-291-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | rebase -i: fix misleading error message after 'exec no-such' instructionJohannes Sixt2012-09-181-0/+11
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'rr/test-use-shell-path-not-shell'Junio C Hamano2012-09-291-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | test-lib: use $SHELL_PATH, not $SHELLRamkumar Ramachandra2012-09-251-16/+16
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'rr/test-make-sure-we-have-git'Junio C Hamano2012-09-252-10/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t/test-lib: make sure Git has already been builtRamkumar Ramachandra2012-09-182-10/+9
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'ep/malloc-check-perturb'Junio C Hamano2012-09-252-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | MALLOC_CHECK: various clean-upsJunio C Hamano2012-09-172-6/+21
| * | | | | | | | | | | | | | | Add MALLOC_CHECK_ and MALLOC_PERTURB_ libc env to the test suite for detectin...Elia Pinto2012-09-141-0/+9
* | | | | | | | | | | | | | | | Merge branch 'aj/xfuncname-ada'Junio C Hamano2012-09-255-1/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add userdiff patterns for AdaAdrian Johnson2012-09-165-1/+55
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jc/maint-mailinfo-mime-attr'Junio C Hamano2012-09-255-1/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | mailinfo: do not concatenate charset= attribute values from mime headersJunio C Hamano2012-09-175-1/+30
* | | | | | | | | | | | | | | Merge branch 'jc/maint-log-grep-all-match'Junio C Hamano2012-09-181-14/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | t7810-grep: test --all-match with multiple --grep and --author optionsMichael J Gruber2012-09-151-0/+20
| * | | | | | | | | | | | | | t7810-grep: test interaction of multiple --grep and --author optionsMichael J Gruber2012-09-151-16/+22
| * | | | | | | | | | | | | | t7810-grep: test multiple --author with --all-matchMichael J Gruber2012-09-151-0/+8
| * | | | | | | | | | | | | | t7810-grep: test multiple --grep with and without --all-matchMichael J Gruber2012-09-151-0/+16
| * | | | | | | | | | | | | | t7810-grep: bring log --grep tests in common formMichael J Gruber2012-09-151-6/+18
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'pw/p4-submit-conflicts'Junio C Hamano2012-09-185-51/+502
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | git-p4: add submit --conflict option and config varaiablePete Wyckoff2012-09-161-0/+63
| * | | | | | | | | | | | | | git p4: add submit --prepare-p4-only optionPete Wyckoff2012-09-161-0/+24
| * | | | | | | | | | | | | | git p4: add submit --dry-run optionPete Wyckoff2012-09-161-0/+41
| * | | | | | | | | | | | | | git p4: revert deleted files after submit cancelPete Wyckoff2012-09-161-0/+119
| * | | | | | | | | | | | | | git p4: test clean-up after failed submit, fix added filesPete Wyckoff2012-09-161-0/+132
| * | | | | | | | | | | | | | git p4: standardize submit cancel due to unchanged templatePete Wyckoff2012-09-161-1/+1
| * | | | | | | | | | | | | | git p4: move conflict prompt into run, add [q]uit inputPete Wyckoff2012-09-161-4/+27
| * | | | | | | | | | | | | | git p4: gracefully fail if some commits could not be appliedPete Wyckoff2012-09-162-47/+95
| * | | | | | | | | | | | | | git p4 test: remove bash-ism of combined export/assignmentPete Wyckoff2012-09-161-3/+4
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mv/cherry-pick-s'Junio C Hamano2012-09-183-8/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | cherry-pick: don't forget -s on failureMiklos Vajna2012-09-143-8/+51
* | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2012-09-171-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | t/perf: add "trash directory" to .gitignoreRamkumar Ramachandra2012-09-171-2/+3
| * | | | | | | | | | | | | | Merge branch 'mz/cherry-pick-cmdline-order' into maintJunio C Hamano2012-09-142-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with 1.7.11.7Junio C Hamano2012-09-142-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11Junio C Hamano2012-09-141-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rj/test-regex' into maint-1.7.11Junio C Hamano2012-09-141-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-1210-96/+191
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge branch 'jc/apply-binary-p0' into maint-1.7.11Junio C Hamano2012-09-121-21/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status