Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'js/larger-timestamps' | Junio C Hamano | 2017-05-16 |
|\ | |||
| * | timestamp_t: a new data type for timestamps | Johannes Schindelin | 2017-04-27 |
| * | PRItime: introduce a new "printf format" for timestamps | Johannes Schindelin | 2017-04-23 |
| * | parse_timestamp(): specify explicitly where we parse timestamps | Johannes Schindelin | 2017-04-23 |
| * | t0006 & t5000: skip "far in the future" test when time_t is too limited | Johannes Schindelin | 2017-04-20 |
| * | t0006 & t5000: prepare for 64-bit timestamps | Johannes Schindelin | 2017-04-20 |
* | | Merge branch 'jn/clone-add-empty-config-from-command-line' | Junio C Hamano | 2017-05-16 |
|\ \ | |||
| * | | clone: handle empty config values in -c | Jonathan Nieder | 2017-05-02 |
* | | | Merge branch 'rs/large-zip' | Junio C Hamano | 2017-05-16 |
|\ \ \ | |||
| * | | | t5004: require 64-bit support for big ZIP tests | René Scharfe | 2017-05-01 |
| * | | | archive-zip: support files bigger than 4GB | René Scharfe | 2017-04-24 |
| * | | | archive-zip: support archives bigger than 4GB | René Scharfe | 2017-04-24 |
| * | | | archive-zip: add tests for big ZIP archives | René Scharfe | 2017-04-24 |
* | | | | Merge branch 'ab/clone-no-tags' | Junio C Hamano | 2017-05-16 |
|\ \ \ \ | |||
| * | | | | tests: rename a test having to do with shallow submodules | Ævar Arnfjörð Bjarmason | 2017-05-01 |
| * | | | | clone: add a --no-tags option to clone without tags | Ævar Arnfjörð Bjarmason | 2017-05-01 |
| * | | | | tests: change "cd ... && git fetch" to "cd &&\n\tgit fetch" | Ævar Arnfjörð Bjarmason | 2017-05-01 |
* | | | | | Merge branch 'sk/status-short-branch-color-config' | Junio C Hamano | 2017-05-16 |
|\ \ \ \ \ | |||
| * | | | | | status: add color config slots for branch info in "--short --branch" | Stephen Kent | 2017-04-28 |
| * | | | | | status: fix missing newline when comment chars are disabled | Jeff King | 2017-04-28 |
* | | | | | | Merge branch 'jt/use-trailer-api-in-commands' | Junio C Hamano | 2017-05-16 |
|\ \ \ \ \ \ | |||
| * | | | | | | sequencer: add newline before adding footers | Jonathan Tan | 2017-04-26 |
* | | | | | | | Merge branch 'nd/worktree-kill-parse-ref' | Junio C Hamano | 2017-05-16 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | refs: kill set_worktree_head_symref() | Nguyễn Thái Ngọc Duy | 2017-04-24 |
| * | | | | | | | worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe() | Nguyễn Thái Ngọc Duy | 2017-04-24 |
* | | | | | | | | Merge branch 'dt/gc-ignore-old-gc-logs' | Junio C Hamano | 2017-05-16 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | test-lib: retire $remove_trash variable | Junio C Hamano | 2017-04-24 |
| * | | | | | | | | test-lib.sh: do not barf under --debug at the end of the test | Junio C Hamano | 2017-04-24 |
| * | | | | | | | | test-lib: abort when can't remove trash directory | SZEDER Gábor | 2017-04-23 |
* | | | | | | | | | Merge branch 'jk/no-null-sha1-in-cache-tree' | Junio C Hamano | 2017-05-16 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | cache-tree: reject entries with null sha1 | Jeff King | 2017-04-23 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'jh/verify-index-checksum-only-in-fsck' | Junio C Hamano | 2017-05-09 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | t1450: avoid use of "sed" on the index, which is a binary file | Jeff Hostetler | 2017-04-27 |
* | | | | | | | | | | Merge branch 'sh/rebase-i-reread-todo-after-exec' | Junio C Hamano | 2017-05-01 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | rebase -i: reread the todo list if `exec` touched it | Stephen Hicks | 2017-04-27 |
* | | | | | | | | | | | Merge branch 'jk/submodule-init-segv-fix' | Junio C Hamano | 2017-05-01 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | submodule_init: die cleanly on submodules without url defined | Jeff King | 2017-04-24 |
* | | | | | | | | | | | | Merge branch 'ab/align-perf-descriptions' | Junio C Hamano | 2017-05-01 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | t/perf: correctly align non-ASCII descriptions in output | Ævar Arnfjörð Bjarmason | 2017-04-23 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'nd/worktree-add-lock' | Junio C Hamano | 2017-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | worktree add: add --lock option | Nguyễn Thái Ngọc Duy | 2017-04-20 |
* | | | | | | | | | | | | Merge branch 'ab/completion-push-delete-ref' | Junio C Hamano | 2017-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | completion: expand "push --delete <remote> <ref>" for refs on that <remote> | Ævar Arnfjörð Bjarmason | 2017-04-23 |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'jh/add-index-entry-optim' | Junio C Hamano | 2017-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | p0006-read-tree-checkout: perf test to time read-tree | Jeff Hostetler | 2017-04-19 |
| * | | | | | | | | | | | | read-cache: add strcmp_offset function | Jeff Hostetler | 2017-04-15 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'nd/conditional-config-in-early-config' | Junio C Hamano | 2017-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | config: correct file reading order in read_early_config() | Nguyễn Thái Ngọc Duy | 2017-04-19 |
| * | | | | | | | | | | | | config: handle conditional include when $GIT_DIR is not set up | Nguyễn Thái Ngọc Duy | 2017-04-17 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge branch 'ab/push-cas-doc-n-test' | Junio C Hamano | 2017-04-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ |