summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/checkout-recurse-submodules'Junio C Hamano2017-05-293-8/+1
|\
| * submodule: properly recurse for read-tree and checkoutsb/checkout-recurse-submodulesStefan Beller2017-05-043-8/+1
* | Merge branch 'sb/reset-recurse-submodules'Junio C Hamano2017-05-292-3/+29
|\ \
| * | builtin/reset: add --recurse-submodules switchsb/reset-recurse-submodulesStefan Beller2017-04-231-0/+8
| * | submodule.c: submodule_move_head works with broken submodulesStefan Beller2017-04-181-3/+20
| * | submodule.c: uninitialized submodules are ignored in recursive commandsStefan Beller2017-04-181-0/+1
* | | Merge branch 'ab/fix-poison-tests'Junio C Hamano2017-05-2315-34/+38
|\ \ \
| * | | tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason2017-05-1115-34/+38
| | |/ | |/|
* | | Merge branch 'tb/dedup-crlf-tests'Junio C Hamano2017-05-232-187/+0
|\ \ \
| * | | t0027: tests are not expensive; remove t0025tb/dedup-crlf-testsTorsten Bögershausen2017-05-102-187/+0
* | | | Merge branch 'jt/push-options-doc'Junio C Hamano2017-05-231-0/+37
|\ \ \ \
| * | | | receive-pack: verify push options in certjt/push-options-docJonathan Tan2017-05-101-0/+37
* | | | | Merge branch 'ab/doc-replace-gmane-links'Junio C Hamano2017-05-231-1/+1
|\ \ \ \ \
| * | | | | doc: replace more gmane linksab/doc-replace-gmane-linksJunio C Hamano2017-05-091-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'ah/log-decorate-default-to-auto'Junio C Hamano2017-05-231-0/+12
|\ \ \ \ \
| * | | | | builtin/log: honor log.decorateah/log-decorate-default-to-autobrian m. carlson2017-05-151-0/+12
* | | | | | Merge branch 'bw/submodule-with-bs-path'Junio C Hamano2017-05-231-1/+1
|\ \ \ \ \ \
| * | | | | | t7400: add !CYGWIN prerequisite to 'add with \\ in path'bw/submodule-with-bs-pathRamsay Jones2017-05-011-1/+1
* | | | | | | Merge branch 'js/larger-timestamps'Junio C Hamano2017-05-166-15/+24
|\ \ \ \ \ \ \
| * | | | | | | timestamp_t: a new data type for timestampsJohannes Schindelin2017-04-273-6/+6
| * | | | | | | PRItime: introduce a new "printf format" for timestampsJohannes Schindelin2017-04-233-3/+3
| * | | | | | | parse_timestamp(): specify explicitly where we parse timestampsJohannes Schindelin2017-04-231-1/+1
| * | | | | | | t0006 & t5000: skip "far in the future" test when time_t is too limitedJohannes Schindelin2017-04-204-4/+8
| * | | | | | | t0006 & t5000: prepare for 64-bit timestampsJohannes Schindelin2017-04-204-6/+11
* | | | | | | | Merge branch 'jn/clone-add-empty-config-from-command-line'Junio C Hamano2017-05-161-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-lineJonathan Nieder2017-05-021-0/+8
* | | | | | | | | Merge branch 'rs/large-zip'Junio C Hamano2017-05-162-0/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t5004: require 64-bit support for big ZIP testsrs/large-zipRené Scharfe2017-05-011-2/+7
| * | | | | | | | | archive-zip: support files bigger than 4GBRené Scharfe2017-04-241-1/+1
| * | | | | | | | | archive-zip: support archives bigger than 4GBRené Scharfe2017-04-241-1/+1
| * | | | | | | | | archive-zip: add tests for big ZIP archivesRené Scharfe2017-04-242-0/+45
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/clone-no-tags'Junio C Hamano2017-05-162-11/+92
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tests: rename a test having to do with shallow submodulesab/clone-no-tagsÆvar Arnfjörð Bjarmason2017-05-011-0/+0
| * | | | | | | | | clone: add a --no-tags option to clone without tagsÆvar Arnfjörð Bjarmason2017-05-011-2/+74
| * | | | | | | | | tests: change "cd ... && git fetch" to "cd &&\n\tgit fetch"Ævar Arnfjörð Bjarmason2017-05-011-9/+18
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'sk/status-short-branch-color-config'Junio C Hamano2017-05-161-5/+114
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-configStephen Kent2017-04-281-2/+4
| * | | | | | | | | status: fix missing newline when comment chars are disabledJeff King2017-04-281-4/+111
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'jt/use-trailer-api-in-commands'Junio C Hamano2017-05-161-0/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sequencer: add newline before adding footersjt/use-trailer-api-in-commandsJonathan Tan2017-04-261-0/+44
* | | | | | | | | | Merge branch 'nd/worktree-kill-parse-ref'Junio C Hamano2017-05-162-0/+70
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | refs: kill set_worktree_head_symref()Nguyễn Thái Ngọc Duy2017-04-241-0/+12
| * | | | | | | | | | worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()Nguyễn Thái Ngọc Duy2017-04-242-0/+58
* | | | | | | | | | | Merge branch 'dt/gc-ignore-old-gc-logs'Junio C Hamano2017-05-161-4/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | test-lib: retire $remove_trash variabledt/gc-ignore-old-gc-logsJunio C Hamano2017-04-241-6/+4
| * | | | | | | | | | | test-lib.sh: do not barf under --debug at the end of the testJunio C Hamano2017-04-241-5/+8
| * | | | | | | | | | | test-lib: abort when can't remove trash directorySZEDER Gábor2017-04-231-2/+5
* | | | | | | | | | | | Merge branch 'jk/no-null-sha1-in-cache-tree'Junio C Hamano2017-05-162-0/+28
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | cache-tree: reject entries with null sha1jk/no-null-sha1-in-cache-treeJeff King2017-04-232-0/+28
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck'Junio C Hamano2017-05-091-8/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |