aboutsummaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAge
* Merge branch 'da/mergetool-diff-order'Junio C Hamano2016-10-17
|\
| * mergetool: honor -O<orderfile>David Aguilar2016-10-11
| * mergetool: honor diff.orderFileDavid Aguilar2016-10-11
* | Merge branch 'jk/ref-symlink-loop'Junio C Hamano2016-10-17
|\ \
| * | files_read_raw_ref: avoid infinite loop on broken symlinksJeff King2016-10-10
| * | Merge branch 'jk/pack-tag-of-tag' into maintJunio C Hamano2016-10-03
| |\ \
| * \ \ Merge branch 'tg/add-chmod+x-fix' into maintJunio C Hamano2016-09-29
| |\ \ \
| * \ \ \ Merge branch 'rt/rebase-i-broken-insn-advise' into maintJunio C Hamano2016-09-29
| |\ \ \ \
| * \ \ \ \ Merge branch 'js/regexec-buf' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nd/checkout-disambiguation' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/rebase-i-drop-ident-check' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jt/format-patch-base-info-above-sig' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'ks/perf-build-with-autoconf' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/fix-remote-curl-url-wo-proto' into maintJunio C Hamano2016-09-29
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/quarantine-received-objects'Junio C Hamano2016-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | receive-pack: quarantine objects until pre-receive acceptsJeff King2016-10-10
* | | | | | | | | | | | | | Merge branch 'jk/alt-odb-cleanup'Junio C Hamano2016-10-17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | alternates: use fspathcmp to detect duplicatesJeff King2016-10-10
| * | | | | | | | | | | | | sha1_file: always allow relative paths to alternatesJeff King2016-10-10
| * | | | | | | | | | | | | count-objects: report alternates via verbose modeJeff King2016-10-10
| * | | | | | | | | | | | | t5613: clarify "too deep" recursion testsJeff King2016-10-10
| * | | | | | | | | | | | | t5613: do not chdir in main processJeff King2016-10-03
| * | | | | | | | | | | | | t5613: whitespace/style cleanupsJeff King2016-10-03
| * | | | | | | | | | | | | t5613: use test_must_failJeff King2016-10-03
| * | | | | | | | | | | | | t5613: drop test_valid_repo functionJeff King2016-10-03
| * | | | | | | | | | | | | t5613: drop reachable_via functionJeff King2016-10-03
* | | | | | | | | | | | | | Merge branch 'nd/shallow-deepen'Junio C Hamano2016-10-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fetch, upload-pack: --deepen=N extends shallow boundary by N commitsNguyễn Thái Ngọc Duy2016-06-13
| * | | | | | | | | | | | | | t5500, t5539: tests for shallow depth excluding a refNguyễn Thái Ngọc Duy2016-06-13
| * | | | | | | | | | | | | | t5500, t5539: tests for shallow depth since a specific dateNguyễn Thái Ngọc Duy2016-06-13
* | | | | | | | | | | | | | | Merge branch 'jk/pack-objects-optim-mru'Junio C Hamano2016-10-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | pack-objects: break delta cycles before delta-search phaseJeff King2016-08-11
* | | | | | | | | | | | | | | | Merge branch 'rs/qsort'Junio C Hamano2016-10-10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | use QSORTRené Scharfe2016-09-29
* | | | | | | | | | | | | | | | Merge branch 'rs/c-auto-resets-attributes'Junio C Hamano2016-10-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | pretty: avoid adding reset for %C(auto) if output is emptyRené Scharfe2016-09-29
* | | | | | | | | | | | | | | | | Merge branch 'vn/revision-shorthand-for-side-branch-log'Junio C Hamano2016-10-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | revision: new rev^-n shorthand for rev^n..revVegard Nossum2016-09-27
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'jk/ambiguous-short-object-names'Junio C Hamano2016-10-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | get_short_sha1: make default disambiguation configurableJeff King2016-09-27
| * | | | | | | | | | | | | | | | get_short_sha1: list ambiguous objects on errorJeff King2016-09-26
| * | | | | | | | | | | | | | | | for_each_abbrev: drop duplicate objectsJeff King2016-09-26
| * | | | | | | | | | | | | | | | sha1_array: let callbacks interrupt iterationJeff King2016-09-26
| * | | | | | | | | | | | | | | | get_short_sha1: parse tags when looking for treeishJeff King2016-09-26
| * | | | | | | | | | | | | | | | get_sha1: propagate flags to child functionsJeff King2016-09-26
| * | | | | | | | | | | | | | | | get_sha1: avoid repeating ourselves via ONLY_TO_DIEJeff King2016-09-26
* | | | | | | | | | | | | | | | | Merge branch 'dt/tree-fsck'Junio C Hamano2016-10-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | fsck: handle bad trees like other errorsDavid Turner2016-09-27
| * | | | | | | | | | | | | | | | | tree-walk: be more specific about corrupt tree errorsJeff King2016-09-27
| |/ / / / / / / / / / / / / / / /