summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/filter-branch'Junio C Hamano2008-09-022-2/+99
|\
| * Merge branch 'jc/post-simplify' into tr/filter-branchJunio C Hamano2008-08-121-0/+93
| |\
| | * Topo-sort before --simplify-mergesJunio C Hamano2008-08-031-0/+93
| * | filter-branch: fix ref rewriting with --subdirectory-filterThomas Rast2008-08-121-1/+1
| * | filter-branch: Extend test to show rewriting bugThomas Rast2008-08-121-3/+7
* | | Merge branch 'maint'Junio C Hamano2008-09-021-3/+3
|\ \ \
| * | | Bring local clone's origin URL in line with that of a remote cloneJohan Herland2008-09-011-3/+3
* | | | Merge branch 'maint'Junio C Hamano2008-08-302-3/+92
|\ \ \ \ | |/ / /
| * | | git-apply: Loosen "match_beginning" logicJunio C Hamano2008-08-301-3/+12
| * | | Merge branch 'sp/missing-thin-base' into maintJunio C Hamano2008-08-301-0/+80
| |\ \ \
| | * | | pack-objects: Allow missing base objects when creating thin packsShawn O. Pearce2008-08-121-0/+80
| | |/ /
| * | | Merge branch 'np/verify-pack' into maintJunio C Hamano2008-08-291-0/+6
| |\ \ \
* | \ \ \ Merge branch 'maint'Junio C Hamano2008-08-291-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | pretty=format: respect date format optionsJeff King2008-08-291-0/+6
* | | | | Merge branch 'mv/merge-custom'Junio C Hamano2008-08-272-0/+53
|\ \ \ \ \
| * | | | | t7606: fix custom merge testJunio C Hamano2008-08-231-2/+5
| * | | | | Add a second testcase for handling invalid strategies in git-mergeMiklos Vajna2008-07-291-0/+4
| * | | | | Add a new test for using a custom merge strategyMiklos Vajna2008-07-291-0/+46
* | | | | | Merge branch 'am/cherry-pick-rerere'Junio C Hamano2008-08-271-0/+45
|\ \ \ \ \ \
| * | | | | | Make cherry-pick use rerere for conflict resolution.Abhijit Menon-Sen2008-08-111-0/+45
* | | | | | | Merge branch 'np/verify-pack'Junio C Hamano2008-08-271-0/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | discard revindex data when pack list changesNicolas Pitre2008-08-221-0/+6
* | | | | | | Merge branch 'maint'Junio C Hamano2008-08-264-10/+26
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Suppress some bash redirection error messagesRamsay Jones2008-08-263-10/+4
| * | | | | | Fix "git log -i --grep"Jeff King2008-08-241-0/+22
* | | | | | | format-patch: use default diff format even with patch optionsJeff King2008-08-261-0/+25
* | | | | | | Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-244-1/+39
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'ag/maint-combine-diff-fix' into maintJunio C Hamano2008-08-241-0/+16
| |\ \ \ \ \ \
| | * | | | | | Respect core.autocrlf in combined diffAlexander Gavrilov2008-08-231-0/+16
| | |/ / / / /
| * | | | | | merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-233-1/+23
| |/ / / / /
* | | | | | Extend "checkout --track" DWIM to support more casesAlex Riesen2008-08-221-1/+22
* | | | | | filter-branch: Grok special characters in tag namesJohannes Sixt2008-08-211-0/+8
* | | | | | test-lib: do not remove trash_directory if called with --debugJohannes Schindelin2008-08-211-1/+1
* | | | | | Merge branch 'jc/add-stop-at-symlink'Junio C Hamano2008-08-201-0/+25
|\ \ \ \ \ \
| * | | | | | add: refuse to add working tree items beyond symlinksJunio C Hamano2008-08-041-1/+6
| * | | | | | update-index: refuse to add working tree items beyond symlinksJunio C Hamano2008-08-041-0/+20
* | | | | | | Merge branch 'kh/diff-tree'Junio C Hamano2008-08-201-0/+14
|\ \ \ \ \ \ \
| * | | | | | | Add test for diff-tree --stdin with two treesKarl Hasselström2008-08-111-0/+14
* | | | | | | | Merge branch 'mg/count-objects'Junio C Hamano2008-08-201-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | count-objects: Add total pack size to verbose outputMarcus Griep2008-08-171-1/+1
* | | | | | | | | Merge branch 'cc/merge-base-many'Junio C Hamano2008-08-201-0/+48
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge-base-many: add trivial tests based on the documentationJunio C Hamano2008-07-291-0/+48
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/test-deeper'Junio C Hamano2008-08-2050-131/+152
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano2008-08-1751-134/+152
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/parallel-test'Junio C Hamano2008-08-204-7/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update t/.gitignore to ignore all trash directoriesMarcus Griep2008-08-181-1/+1
| * | | | | | | | | Enable parallel testsJohannes Schindelin2008-08-082-2/+7
| * | | | | | | | | tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'Johannes Schindelin2008-08-081-1/+6
| * | | | | | | | | t9700: remove useless checkJohannes Schindelin2008-08-081-3/+0
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2008-08-206-0/+55
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |