summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/color-and-pager'Junio C Hamano2011-08-282-23/+61
|\
| * color: delay auto-color decision until point of useJeff King2011-08-191-0/+12
| * setup_pager: set GIT_PAGER_IN_USEJeff King2011-08-181-0/+11
| * t7006: use test_config helpersJeff King2011-08-181-21/+18
| * test-lib: add helper functions for configJeff King2011-08-181-0/+18
| * t7006: modernize calls to unsetJeff King2011-08-181-2/+2
* | Merge branch 'di/fast-import-tagging'Junio C Hamano2011-08-281-0/+67
|\ \
| * | fast-import: allow to tag newly created objectsDmitry Ivankov2011-08-231-0/+26
| * | fast-import: add tests for tagging blobsDmitry Ivankov2011-08-231-0/+41
* | | Merge branch 'di/fast-import-deltified-tree'Junio C Hamano2011-08-281-0/+41
|\ \ \
| * | | fast-import: prevent producing bad deltaDmitry Ivankov2011-08-141-1/+1
| * | | fast-import: add a test for tree delta base corruptionDmitry Ivankov2011-08-141-0/+41
| |/ /
* | | Merge branch 'di/fast-import-ident'Junio C Hamano2011-08-282-0/+135
|\ \ \
| * | | fsck: improve committer/author checkDmitry Ivankov2011-08-111-3/+3
| * | | fsck: add a few committer name testsDmitry Ivankov2011-08-111-0/+36
| * | | fast-import: check committer name more strictlyDmitry Ivankov2011-08-111-5/+5
| * | | fast-import: don't fail on omitted committer nameDmitry Ivankov2011-08-111-1/+1
| * | | fast-import: add input format testsDmitry Ivankov2011-08-111-0/+99
| |/ /
* | | Merge branch 'va/p4-branch-import'Junio C Hamano2011-08-281-0/+200
|\ \ \
| * | | git-p4: Add simple test case for branch importVitor Antunes2011-08-221-0/+64
| * | | git-p4: Add test case for copy detectionVitor Antunes2011-08-221-0/+83
| * | | git-p4: Add test case for rename detectionVitor Antunes2011-08-221-0/+53
* | | | Merge branch 'jc/merge-reword'Junio C Hamano2011-08-251-3/+3
|\ \ \ \
| * | | | merge: reword the final messageJunio C Hamano2011-05-251-3/+3
* | | | | Merge branch 'mg/branch-set-upstream-previous'Junio C Hamano2011-08-251-0/+14
|\ \ \ \ \
| * | | | | branch.c: use the parsed branch nameMichael J Gruber2011-08-191-0/+14
| | |_|_|/ | |/| | |
| * | | | Merge branch 'jk/tag-list-multiple-patterns' into maintJunio C Hamano2011-08-161-0/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'jl/submodule-update-quiet' into maintJunio C Hamano2011-08-161-2/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jl/submodule-add-relurl-wo-upstream' into maintJunio C Hamano2011-08-161-0/+10
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'js/ls-tree-error' into maintJunio C Hamano2011-08-161-0/+24
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/fast-export-quote-path' into maintJunio C Hamano2011-08-161-1/+27
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/maint-reset-unmerged-path' into maintJunio C Hamano2011-08-161-0/+15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/submodule-sync-no-auto-vivify' into maintJunio C Hamano2011-08-161-2/+13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4' into maintJunio C Hamano2011-08-161-0/+18
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'aw/rebase-i-p' into maintJunio C Hamano2011-08-163-3/+29
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano2011-08-161-0/+212
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'di/fast-import-doc'Junio C Hamano2011-08-251-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | doc/fast-import: document feature import-marks-if-existsDmitry Ivankov2011-08-171-0/+47
* | | | | | | | | | | | | | | Merge branch 'jn/plug-empty-tree-leak'Junio C Hamano2011-08-251-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | revert: plug memory leak in "cherry-pick root commit" codepathJonathan Nieder2011-08-161-1/+26
* | | | | | | | | | | | | | | | Merge branch 'rt/zlib-smaller-window'Junio C Hamano2011-08-2322-7/+73
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | test: consolidate definition of $LFJunio C Hamano2011-08-115-9/+4
| * | | | | | | | | | | | | | | | Tolerate zlib deflation with window size < 32KbRoberto Tyley2011-08-1118-0/+71
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'jn/maint-test-return'Junio C Hamano2011-08-232-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | t3900: do not reference numbered arguments from the test scriptJohannes Sixt2011-08-111-2/+2
| * | | | | | | | | | | | | | | | test: cope better with use of return for errorsJonathan Nieder2011-08-081-2/+8
| * | | | | | | | | | | | | | | | test: simplify return value of test_run_Jonathan Nieder2011-08-081-5/+3
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'jl/maint-fetch-recursive-fix' into maintJunio C Hamano2011-08-011-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jc/maint-1.7.3-checkout-describe' into maintJunio C Hamano2011-08-011-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/maint-ls-files-error-report'Junio C Hamano2011-08-231-0/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status