Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'sb/checkout-recurse-submodules' | Junio C Hamano | 2017-05-29 | 3 | -8/+1 |
|\ | |||||
| * | submodule: properly recurse for read-tree and checkoutsb/checkout-recurse-submodules | Stefan Beller | 2017-05-04 | 3 | -8/+1 |
* | | Merge branch 'sb/reset-recurse-submodules' | Junio C Hamano | 2017-05-29 | 2 | -3/+29 |
|\ \ | |||||
| * | | builtin/reset: add --recurse-submodules switchsb/reset-recurse-submodules | Stefan Beller | 2017-04-23 | 1 | -0/+8 |
| * | | submodule.c: submodule_move_head works with broken submodules | Stefan Beller | 2017-04-18 | 1 | -3/+20 |
| * | | submodule.c: uninitialized submodules are ignored in recursive commands | Stefan Beller | 2017-04-18 | 1 | -0/+1 |
* | | | Merge branch 'ab/fix-poison-tests' | Junio C Hamano | 2017-05-23 | 15 | -34/+38 |
|\ \ \ | |||||
| * | | | tests: fix tests broken under GETTEXT_POISON=YesPlease | Ævar Arnfjörð Bjarmason | 2017-05-11 | 15 | -34/+38 |
| | |/ | |/| | |||||
* | | | Merge branch 'tb/dedup-crlf-tests' | Junio C Hamano | 2017-05-23 | 2 | -187/+0 |
|\ \ \ | |||||
| * | | | t0027: tests are not expensive; remove t0025tb/dedup-crlf-tests | Torsten Bögershausen | 2017-05-10 | 2 | -187/+0 |
* | | | | Merge branch 'jt/push-options-doc' | Junio C Hamano | 2017-05-23 | 1 | -0/+37 |
|\ \ \ \ | |||||
| * | | | | receive-pack: verify push options in certjt/push-options-doc | Jonathan Tan | 2017-05-10 | 1 | -0/+37 |
* | | | | | Merge branch 'ab/doc-replace-gmane-links' | Junio C Hamano | 2017-05-23 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | doc: replace more gmane linksab/doc-replace-gmane-links | Junio C Hamano | 2017-05-09 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'ah/log-decorate-default-to-auto' | Junio C Hamano | 2017-05-23 | 1 | -0/+12 |
|\ \ \ \ \ | |||||
| * | | | | | builtin/log: honor log.decorateah/log-decorate-default-to-auto | brian m. carlson | 2017-05-15 | 1 | -0/+12 |
* | | | | | | Merge branch 'bw/submodule-with-bs-path' | Junio C Hamano | 2017-05-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t7400: add !CYGWIN prerequisite to 'add with \\ in path'bw/submodule-with-bs-path | Ramsay Jones | 2017-05-01 | 1 | -1/+1 |
* | | | | | | | Merge branch 'js/larger-timestamps' | Junio C Hamano | 2017-05-16 | 6 | -15/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | timestamp_t: a new data type for timestamps | Johannes Schindelin | 2017-04-27 | 3 | -6/+6 |
| * | | | | | | | PRItime: introduce a new "printf format" for timestamps | Johannes Schindelin | 2017-04-23 | 3 | -3/+3 |
| * | | | | | | | parse_timestamp(): specify explicitly where we parse timestamps | Johannes Schindelin | 2017-04-23 | 1 | -1/+1 |
| * | | | | | | | t0006 & t5000: skip "far in the future" test when time_t is too limited | Johannes Schindelin | 2017-04-20 | 4 | -4/+8 |
| * | | | | | | | t0006 & t5000: prepare for 64-bit timestamps | Johannes Schindelin | 2017-04-20 | 4 | -6/+11 |
* | | | | | | | | Merge branch 'jn/clone-add-empty-config-from-command-line' | Junio C Hamano | 2017-05-16 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | clone: handle empty config values in -cjn/clone-add-empty-config-from-command-line | Jonathan Nieder | 2017-05-02 | 1 | -0/+8 |
* | | | | | | | | | Merge branch 'rs/large-zip' | Junio C Hamano | 2017-05-16 | 2 | -0/+50 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | t5004: require 64-bit support for big ZIP testsrs/large-zip | René Scharfe | 2017-05-01 | 1 | -2/+7 |
| * | | | | | | | | | archive-zip: support files bigger than 4GB | René Scharfe | 2017-04-24 | 1 | -1/+1 |
| * | | | | | | | | | archive-zip: support archives bigger than 4GB | René Scharfe | 2017-04-24 | 1 | -1/+1 |
| * | | | | | | | | | archive-zip: add tests for big ZIP archives | René Scharfe | 2017-04-24 | 2 | -0/+45 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ab/clone-no-tags' | Junio C Hamano | 2017-05-16 | 2 | -11/+92 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | tests: rename a test having to do with shallow submodulesab/clone-no-tags | Ævar Arnfjörð Bjarmason | 2017-05-01 | 1 | -0/+0 |
| * | | | | | | | | | clone: add a --no-tags option to clone without tags | Ævar Arnfjörð Bjarmason | 2017-05-01 | 1 | -2/+74 |
| * | | | | | | | | | tests: change "cd ... && git fetch" to "cd &&\n\tgit fetch" | Ævar Arnfjörð Bjarmason | 2017-05-01 | 1 | -9/+18 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'sk/status-short-branch-color-config' | Junio C Hamano | 2017-05-16 | 1 | -5/+114 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-config | Stephen Kent | 2017-04-28 | 1 | -2/+4 |
| * | | | | | | | | | status: fix missing newline when comment chars are disabled | Jeff King | 2017-04-28 | 1 | -4/+111 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jt/use-trailer-api-in-commands' | Junio C Hamano | 2017-05-16 | 1 | -0/+44 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | sequencer: add newline before adding footersjt/use-trailer-api-in-commands | Jonathan Tan | 2017-04-26 | 1 | -0/+44 |
* | | | | | | | | | | Merge branch 'nd/worktree-kill-parse-ref' | Junio C Hamano | 2017-05-16 | 2 | -0/+70 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | refs: kill set_worktree_head_symref() | Nguyễn Thái Ngọc Duy | 2017-04-24 | 1 | -0/+12 |
| * | | | | | | | | | | worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() | Nguyễn Thái Ngọc Duy | 2017-04-24 | 2 | -0/+58 |
* | | | | | | | | | | | Merge branch 'dt/gc-ignore-old-gc-logs' | Junio C Hamano | 2017-05-16 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | test-lib: retire $remove_trash variabledt/gc-ignore-old-gc-logs | Junio C Hamano | 2017-04-24 | 1 | -6/+4 |
| * | | | | | | | | | | | test-lib.sh: do not barf under --debug at the end of the test | Junio C Hamano | 2017-04-24 | 1 | -5/+8 |
| * | | | | | | | | | | | test-lib: abort when can't remove trash directory | SZEDER Gábor | 2017-04-23 | 1 | -2/+5 |
* | | | | | | | | | | | | Merge branch 'jk/no-null-sha1-in-cache-tree' | Junio C Hamano | 2017-05-16 | 2 | -0/+28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | cache-tree: reject entries with null sha1jk/no-null-sha1-in-cache-tree | Jeff King | 2017-04-23 | 2 | -0/+28 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck' | Junio C Hamano | 2017-05-09 | 1 | -8/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |