Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tb/repack-simplify' | Junio C Hamano | 2020-12-03 | 1 | -99/+54 |
|\ | |||||
| * | builtin/repack.c: don't move existing packs out of the way | Taylor Blau | 2020-11-17 | 1 | -89/+14 |
| * | builtin/repack.c: keep track of what pack-objects wrote | Taylor Blau | 2020-11-17 | 1 | -1/+30 |
| * | repack: make "exts" array available outside cmd_repack() | Jeff King | 2020-11-17 | 1 | -9/+10 |
* | | Merge branch 'pb/pull-rebase-recurse-submodules' | Junio C Hamano | 2020-12-03 | 1 | -12/+36 |
|\ \ | |||||
| * | | pull: check for local submodule modifications with the right range | Philippe Blain | 2020-11-17 | 1 | -1/+1 |
| * | | pull --rebase: compute rebase arguments in separate function | Philippe Blain | 2020-11-17 | 1 | -11/+35 |
* | | | Merge branch 'sa/credential-store-timeout' | Junio C Hamano | 2020-11-30 | 1 | -2/+6 |
|\ \ \ | |||||
| * | | | crendential-store: use timeout when locking file | Simão Afonso | 2020-11-25 | 1 | -2/+6 |
* | | | | Merge branch 'km/stash-error-message-fix' | Junio C Hamano | 2020-11-30 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | stash: add missing space to an error message | Kyle Meyer | 2020-11-24 | 1 | -1/+1 |
* | | | | | Merge branch 'mt/worktree-error-message-fix' | Junio C Hamano | 2020-11-30 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | worktree: fix order of arguments in error message | Matheus Tavares | 2020-11-21 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'ab/gc-keep-base-option' | Junio C Hamano | 2020-11-30 | 1 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | gc: rename keep_base_pack variable for --keep-largest-pack | Ævar Arnfjörð Bjarmason | 2020-11-21 | 1 | -4/+4 |
* | | | | | | Merge branch 'js/pull-rebase-use-advise' | Junio C Hamano | 2020-11-30 | 1 | -12/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | pull: colorize the hint about setting `pull.rebase` | Johannes Schindelin | 2020-11-19 | 1 | -12/+12 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'rs/gc-sort-func-cast-fix' | Junio C Hamano | 2020-11-26 | 1 | -4/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gc: fix cast in compare_tasks_by_selection() | René Scharfe | 2020-11-18 | 1 | -4/+2 |
* | | | | | | | Merge branch 'jk/4gb-idx' | Junio C Hamano | 2020-11-26 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | use size_t to store pack .idx byte offsets | Jeff King | 2020-11-16 | 1 | -3/+3 |
| * | | | | | | | compute pack .idx byte offsets using size_t | Jeff King | 2020-11-16 | 1 | -1/+1 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jx/t5411-flake-fix' | Junio C Hamano | 2020-11-26 | 1 | -25/+69 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | receive-pack: use default version 0 for proc-receive | Jiang Xin | 2020-11-11 | 1 | -1/+6 |
| * | | | | | | receive-pack: gently write messages to proc-receive | Jiang Xin | 2020-11-11 | 1 | -24/+63 |
* | | | | | | | Merge branch 'en/strmap' | Junio C Hamano | 2020-11-22 | 3 | -65/+11 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | shortlog: use strset from strmap.h | Elijah Newren | 2020-11-11 | 1 | -57/+4 |
| * | | | | | | | Use new HASHMAP_INIT macro to simplify hashmap initialization | Elijah Newren | 2020-11-11 | 1 | -5/+4 |
| * | | | | | | | hashmap: provide deallocation function names | Elijah Newren | 2020-11-02 | 2 | -4/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/rev-parse-end-of-options' | Junio C Hamano | 2020-11-22 | 1 | -45/+55 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | rev-parse: handle --end-of-options | Jeff King | 2020-11-10 | 1 | -23/+33 |
| * | | | | | | | rev-parse: put all options under the "-" check | Jeff King | 2020-11-10 | 1 | -24/+23 |
| * | | | | | | | rev-parse: don't accept options after dashdash | Jeff King | 2020-11-10 | 1 | -5/+6 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jc/format-patch-name-max' | Junio C Hamano | 2020-11-22 | 1 | -6/+14 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | format-patch: make output filename configurable | Junio C Hamano | 2020-11-10 | 1 | -6/+14 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'pb/blame-funcname-range-userdiff' | Junio C Hamano | 2020-11-18 | 2 | -7/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | blame: simplify 'setup_blame_bloom_data' interface | Philippe Blain | 2020-11-02 | 1 | -1/+1 |
| * | | | | | | blame: simplify 'setup_scoreboard' interface | Philippe Blain | 2020-11-02 | 1 | -1/+1 |
| * | | | | | | blame: enable funcname blaming with userdiff driver | Philippe Blain | 2020-11-02 | 1 | -2/+2 |
| * | | | | | | line-log: mention both modes in 'blame' and 'log' short help | Philippe Blain | 2020-11-02 | 2 | -3/+4 |
* | | | | | | | Merge branch 'en/merge-ort-api-null-impl' | Junio C Hamano | 2020-11-18 | 3 | -4/+42 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | merge,rebase,revert: select ort or recursive by config or environment | Elijah Newren | 2020-11-03 | 3 | -4/+42 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ds/maintenance-part-3' | Junio C Hamano | 2020-11-18 | 2 | -6/+333 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | maintenance: use 'incremental' strategy by default | Derrick Stolee | 2020-10-16 | 1 | -0/+10 |
| * | | | | | | | maintenance: create maintenance.strategy config | Derrick Stolee | 2020-10-16 | 1 | -2/+26 |
| * | | | | | | | maintenance: add start/stop subcommands | Derrick Stolee | 2020-09-25 | 1 | -0/+124 |
| * | | | | | | | maintenance: add [un]register subcommands | Derrick Stolee | 2020-09-25 | 1 | -1/+54 |
| * | | | | | | | for-each-repo: run subcommands on configured repos | Derrick Stolee | 2020-09-25 | 1 | -0/+58 |
| * | | | | | | | maintenance: add --schedule option and config | Derrick Stolee | 2020-09-25 | 1 | -3/+61 |
* | | | | | | | | Merge branch 'pw/rebase-i-orig-head' | Junio C Hamano | 2020-11-18 | 1 | -10/+10 |
|\ \ \ \ \ \ \ \ |