summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/repack-simplify'Junio C Hamano2020-12-031-99/+54
|\
| * builtin/repack.c: don't move existing packs out of the wayTaylor Blau2020-11-171-89/+14
| * builtin/repack.c: keep track of what pack-objects wroteTaylor Blau2020-11-171-1/+30
| * repack: make "exts" array available outside cmd_repack()Jeff King2020-11-171-9/+10
* | Merge branch 'pb/pull-rebase-recurse-submodules'Junio C Hamano2020-12-031-12/+36
|\ \
| * | pull: check for local submodule modifications with the right rangePhilippe Blain2020-11-171-1/+1
| * | pull --rebase: compute rebase arguments in separate functionPhilippe Blain2020-11-171-11/+35
* | | Merge branch 'sa/credential-store-timeout'Junio C Hamano2020-11-301-2/+6
|\ \ \
| * | | crendential-store: use timeout when locking fileSimão Afonso2020-11-251-2/+6
* | | | Merge branch 'km/stash-error-message-fix'Junio C Hamano2020-11-301-1/+1
|\ \ \ \
| * | | | stash: add missing space to an error messageKyle Meyer2020-11-241-1/+1
* | | | | Merge branch 'mt/worktree-error-message-fix'Junio C Hamano2020-11-301-2/+2
|\ \ \ \ \
| * | | | | worktree: fix order of arguments in error messageMatheus Tavares2020-11-211-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'ab/gc-keep-base-option'Junio C Hamano2020-11-301-4/+4
|\ \ \ \ \
| * | | | | gc: rename keep_base_pack variable for --keep-largest-packÆvar Arnfjörð Bjarmason2020-11-211-4/+4
* | | | | | Merge branch 'js/pull-rebase-use-advise'Junio C Hamano2020-11-301-12/+12
|\ \ \ \ \ \
| * | | | | | pull: colorize the hint about setting `pull.rebase`Johannes Schindelin2020-11-191-12/+12
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs/gc-sort-func-cast-fix'Junio C Hamano2020-11-261-4/+2
|\ \ \ \ \ \
| * | | | | | gc: fix cast in compare_tasks_by_selection()René Scharfe2020-11-181-4/+2
* | | | | | | Merge branch 'jk/4gb-idx'Junio C Hamano2020-11-262-4/+4
|\ \ \ \ \ \ \
| * | | | | | | use size_t to store pack .idx byte offsetsJeff King2020-11-161-3/+3
| * | | | | | | compute pack .idx byte offsets using size_tJeff King2020-11-161-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jx/t5411-flake-fix'Junio C Hamano2020-11-261-25/+69
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | receive-pack: use default version 0 for proc-receiveJiang Xin2020-11-111-1/+6
| * | | | | | receive-pack: gently write messages to proc-receiveJiang Xin2020-11-111-24/+63
* | | | | | | Merge branch 'en/strmap'Junio C Hamano2020-11-223-65/+11
|\ \ \ \ \ \ \
| * | | | | | | shortlog: use strset from strmap.hElijah Newren2020-11-111-57/+4
| * | | | | | | Use new HASHMAP_INIT macro to simplify hashmap initializationElijah Newren2020-11-111-5/+4
| * | | | | | | hashmap: provide deallocation function namesElijah Newren2020-11-022-4/+4
| |/ / / / / /
* | | | | | | Merge branch 'jk/rev-parse-end-of-options'Junio C Hamano2020-11-221-45/+55
|\ \ \ \ \ \ \
| * | | | | | | rev-parse: handle --end-of-optionsJeff King2020-11-101-23/+33
| * | | | | | | rev-parse: put all options under the "-" checkJeff King2020-11-101-24/+23
| * | | | | | | rev-parse: don't accept options after dashdashJeff King2020-11-101-5/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jc/format-patch-name-max'Junio C Hamano2020-11-221-6/+14
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | format-patch: make output filename configurableJunio C Hamano2020-11-101-6/+14
| |/ / / / /
* | | | | | Merge branch 'pb/blame-funcname-range-userdiff'Junio C Hamano2020-11-182-7/+8
|\ \ \ \ \ \
| * | | | | | blame: simplify 'setup_blame_bloom_data' interfacePhilippe Blain2020-11-021-1/+1
| * | | | | | blame: simplify 'setup_scoreboard' interfacePhilippe Blain2020-11-021-1/+1
| * | | | | | blame: enable funcname blaming with userdiff driverPhilippe Blain2020-11-021-2/+2
| * | | | | | line-log: mention both modes in 'blame' and 'log' short helpPhilippe Blain2020-11-022-3/+4
* | | | | | | Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano2020-11-183-4/+42
|\ \ \ \ \ \ \
| * | | | | | | merge,rebase,revert: select ort or recursive by config or environmentElijah Newren2020-11-033-4/+42
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ds/maintenance-part-3'Junio C Hamano2020-11-182-6/+333
|\ \ \ \ \ \ \
| * | | | | | | maintenance: use 'incremental' strategy by defaultDerrick Stolee2020-10-161-0/+10
| * | | | | | | maintenance: create maintenance.strategy configDerrick Stolee2020-10-161-2/+26
| * | | | | | | maintenance: add start/stop subcommandsDerrick Stolee2020-09-251-0/+124
| * | | | | | | maintenance: add [un]register subcommandsDerrick Stolee2020-09-251-1/+54
| * | | | | | | for-each-repo: run subcommands on configured reposDerrick Stolee2020-09-251-0/+58
| * | | | | | | maintenance: add --schedule option and configDerrick Stolee2020-09-251-3/+61
* | | | | | | | Merge branch 'pw/rebase-i-orig-head'Junio C Hamano2020-11-181-10/+10
|\ \ \ \ \ \ \ \