summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* crendential-store: use timeout when locking fileSimão Afonso2020-11-251-2/+6
* 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
|\ \ \ \ \
| * | | | | rebase -i: simplify get_revision_ranges()Phillip Wood2020-11-041-6/+4
| * | | | | rebase -i: use struct object_id when writing statePhillip Wood2020-11-041-2/+3
| * | | | | rebase -i: use struct object_id rather than looking up commitPhillip Wood2020-11-041-2/+3
| * | | | | rebase -i: stop overwriting ORIG_HEAD bufferPhillip Wood2020-11-041-5/+5
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/format-patch-output'Junio C Hamano2020-11-181-15/+22
|\ \ \ \ \
| * | | | | format-patch: support --output optionJeff King2020-11-041-2/+9
| * | | | | format-patch: tie file-opening logic to output_directoryJeff King2020-11-041-6/+6
| * | | | | format-patch: refactor output selectionJeff King2020-11-041-9/+9
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jc/line-log-takes-no-pathspec'Junio C Hamano2020-11-181-0/+3
|\ \ \ \ \
| * | | | | log: diagnose -L used with pathspec as an errorJunio C Hamano2020-11-041-0/+3
| |/ / / /
* | | | | Merge branch 'rs/empty-reflog-check-fix'Junio C Hamano2020-11-181-14/+13
|\ \ \ \ \
| * | | | | stash: simplify reflog emptiness checkRené Scharfe2020-11-021-14/+13
| |/ / / /
| * | | | Merge branch 'jk/committer-date-is-author-date-fix' into maintJunio C Hamano2020-10-291-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge branch 'rs/clear-commit-marks-in-repo'Junio C Hamano2020-11-112-2/+2
|\ \ \ \ \
| * | | | | object: allow clear_commit_marks_all to handle any repoRené Scharfe2020-10-312-2/+2
| |/ / / /
* | | | | Merge branch 'jk/committer-date-is-author-date-fix-simplify'Junio C Hamano2020-11-091-16/+3
|\ \ \ \ \
| * | | | | am, sequencer: stop parsing our own committer identJeff King2020-10-261-16/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'ab/git-remote-exit-code'Junio C Hamano2020-11-091-14/+28
|\ \ \ \ \
| * | | | | remote: add meaningful exit code on missing/existingÆvar Arnfjörð Bjarmason2020-10-271-14/+28
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/checkout-index-errors'Junio C Hamano2020-11-091-2/+14
|\ \ \ \ \
| * | | | | checkout-index: propagate errors to exit codeJeff King2020-10-271-2/+6
| * | | | | checkout-index: drop error message from empty --stage=allJeff King2020-10-271-0/+8
| |/ / / /
* | | | | Merge branch 'mr/bisect-in-c-3'Junio C Hamano2020-11-091-76/+111
|\ \ \ \ \
| * | | | | bisect--helper: retire `--bisect-autostart` subcommandPranit Bauva2020-10-161-9/+0