summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/dotdot-is-parent-directory' into maint-1.7.11Junio C Hamano2012-09-122-0/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-http-half-auth-push' into maint-1.7.11Junio C Hamano2012-09-126-75/+127
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11Junio C Hamano2012-09-121-0/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Sync with 1.7.11.6Junio C Hamano2012-09-115-13/+127
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge branch 'sz/submodule-force-update' into maint-1.7.11Junio C Hamano2012-09-111-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ph/stash-rerere' into maint-1.7.11Junio C Hamano2012-09-111-0/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'hv/submodule-path-unmatch' into maint-1.7.11Junio C Hamano2012-09-111-4/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/empty-rebase-test' into maint-1.7.11Junio C Hamano2012-09-111-1/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano2012-09-111-0/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11Junio C Hamano2012-09-111-8/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/test-prereq' into maintJunio C Hamano2012-09-116-205/+233
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.7.11' into maintJunio C Hamano2012-09-105-0/+176
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bc/receive-pack-stdout-protection' into maint-1.7.11Junio C Hamano2012-09-101-0/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano2012-09-103-0/+128
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tr/maint-send-email-2047' into maint-1.7.11Junio C Hamano2012-09-101-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/fetch-filter-refs'Junio C Hamano2012-09-171-1/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: eliminate spurious error messagesMichael Haggerty2012-09-121-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch-pack: report missing refs even if no existing refs were receivedMichael Haggerty2012-09-121-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fetch_pack(): update sought->nr to reflect number of unique entriesMichael Haggerty2012-09-121-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5500: add tests of fetch-pack --all --depth=N $URL $REFMichael Haggerty2012-09-121-0/+15
View Lorry Controller Status