summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* stash: allow stashes to be referenced by index onlyaw/numbered-stashAaron M Watson2016-10-261-0/+35
* Merge branch 'da/mergetool-diff-order'Junio C Hamano2016-10-171-0/+60
|\
| * mergetool: honor -O<orderfile>da/mergetool-diff-orderDavid Aguilar2016-10-111-0/+27
| * mergetool: honor diff.orderFileDavid Aguilar2016-10-111-0/+33
* | Merge branch 'jk/ref-symlink-loop'Junio C Hamano2016-10-171-0/+5
|\ \
| * | files_read_raw_ref: avoid infinite loop on broken symlinksJeff King2016-10-101-0/+5
| * | Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-031-29/+65
| |\ \
| * \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-292-0/+61
| |\ \ \
| * \ \ \ Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2016-09-291-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-09-291-0/+22
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-292-0/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2016-09-291-0/+47
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-291-6/+27
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ks/perf-build-with-autoconf' into maintJunio C Hamano2016-09-291-1/+7
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano2016-09-291-0/+25
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fix-remote-curl-url-wo-proto' into maintJunio C Hamano2016-09-291-0/+8
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/quarantine-received-objects'Junio C Hamano2016-10-171-0/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | receive-pack: quarantine objects until pre-receive acceptsJeff King2016-10-101-0/+36
* | | | | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-171-89/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | alternates: use fspathcmp to detect duplicatesJeff King2016-10-101-0/+17
| * | | | | | | | | | | | | sha1_file: always allow relative paths to alternatesJeff King2016-10-101-2/+22
| * | | | | | | | | | | | | count-objects: report alternates via verbose modeJeff King2016-10-101-0/+10
| * | | | | | | | | | | | | t5613: clarify "too deep" recursion testsJeff King2016-10-101-8/+19
| * | | | | | | | | | | | | t5613: do not chdir in main processJeff King2016-10-031-59/+33
| * | | | | | | | | | | | | t5613: whitespace/style cleanupsJeff King2016-10-031-52/+62
| * | | | | | | | | | | | | t5613: use test_must_failJeff King2016-10-031-6/+6
| * | | | | | | | | | | | | t5613: drop test_valid_repo functionJeff King2016-10-031-12/+7
| * | | | | | | | | | | | | t5613: drop reachable_via functionJeff King2016-10-031-10/+0
* | | | | | | | | | | | | | Merge branch 'nd/shallow-deepen'Junio C Hamano2016-10-102-0/+141
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fetch, upload-pack: --deepen=N extends shallow boundary by N commitsnd/shallow-deepenNguyễn Thái Ngọc Duy2016-06-132-0/+49
| * | | | | | | | | | | | | | t5500, t5539: tests for shallow depth excluding a refNguyễn Thái Ngọc Duy2016-06-132-0/+43
| * | | | | | | | | | | | | | t5500, t5539: tests for shallow depth since a specific dateNguyễn Thái Ngọc Duy2016-06-132-0/+49
* | | | | | | | | | | | | | | Merge branch 'jk/pack-objects-optim-mru'Junio C Hamano2016-10-101-0/+113
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | pack-objects: break delta cycles before delta-search phaseJeff King2016-08-111-0/+113
* | | | | | | | | | | | | | | | Merge branch 'rs/qsort'Junio C Hamano2016-10-101-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | use QSORTRené Scharfe2016-09-291-4/+2
* | | | | | | | | | | | | | | | Merge branch 'rs/c-auto-resets-attributes'Junio C Hamano2016-10-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pretty: avoid adding reset for %C(auto) if output is emptyrs/c-auto-resets-attributesRené Scharfe2016-09-291-1/+1
* | | | | | | | | | | | | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log'Junio C Hamano2016-10-061-0/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | revision: new rev^-n shorthand for rev^n..revVegard Nossum2016-09-271-0/+94
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-062-1/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | get_short_sha1: make default disambiguation configurableJeff King2016-09-271-0/+14
| * | | | | | | | | | | | | | | | get_short_sha1: list ambiguous objects on errorJeff King2016-09-261-0/+24
| * | | | | | | | | | | | | | | | for_each_abbrev: drop duplicate objectsJeff King2016-09-261-0/+7
| * | | | | | | | | | | | | | | | sha1_array: let callbacks interrupt iterationJeff King2016-09-261-1/+2
| * | | | | | | | | | | | | | | | get_short_sha1: parse tags when looking for treeishJeff King2016-09-261-0/+7
| * | | | | | | | | | | | | | | | get_sha1: propagate flags to child functionsJeff King2016-09-261-1/+13
| * | | | | | | | | | | | | | | | get_sha1: avoid repeating ourselves via ONLY_TO_DIEJeff King2016-09-261-0/+6
* | | | | | | | | | | | | | | | | Merge branch 'dt/tree-fsck'Junio C Hamano2016-10-032-4/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | fsck: handle bad trees like other errorsdt/tree-fsckDavid Turner2016-09-271-2/+14