summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* advice: move advice.graftFileDeprecated squashing to commit.[ch]Ævar Arnfjörð Bjarmason2021-08-251-1/+1
* advice: remove use of global advice_add_embedded_repoÆvar Arnfjörð Bjarmason2021-08-251-3/+4
* advice: remove read uses of most global `advice_` variablesBen Boeckel2021-08-2511-21/+21
* Merge branch 'rs/use-fspathhash'Junio C Hamano2021-08-041-8/+2
|\
| * use fspathhash() everywhereRené Scharfe2021-07-301-8/+2
* | Merge branch 'pb/merge-autostash-more'Junio C Hamano2021-08-041-1/+3
|\ \
| * | merge: apply autostash if merge strategy failsPhilippe Blain2021-07-241-0/+1
| * | merge: apply autostash if fast-forward failsPhilippe Blain2021-07-241-0/+1
| * | merge: add missing word "strategy" to a messagePhilippe Blain2021-07-241-1/+1
* | | Merge branch 'ds/commit-and-checkout-with-sparse-index'Junio C Hamano2021-08-042-5/+6
|\ \ \
| * | | checkout: stop expanding sparse indexesDerrick Stolee2021-07-151-5/+3
| * | | commit: integrate with sparse-indexDerrick Stolee2021-07-151-0/+3
* | | | Merge branch 'ah/plugleaks'Junio C Hamano2021-08-045-14/+17
|\ \ \ \
| * | | | builtin/rebase: fix options.strategy memory lifecycleAndrzej Hunt2021-07-261-1/+2
| * | | | builtin/merge: free found_ref when doneAndrzej Hunt2021-07-261-1/+2
| * | | | builtin/mv: free or UNLEAK multiple pointers at end of cmd_mvAndrzej Hunt2021-07-261-0/+5
| * | | | builtin/for-each-repo: remove unnecessary argv copy to plug leakAndrzej Hunt2021-07-261-10/+4
| * | | | builtin/submodule--helper: release unused strbuf to avoid leakAndrzej Hunt2021-07-261-2/+4
| | |/ / | |/| |
* | | | Merge branch 'ar/submodule-add'Junio C Hamano2021-08-041-113/+304
|\ \ \ \ | |_|_|/ |/| | |
| * | | submodule: drop unused sm_name parameter from show_fetch_remotes()Jeff King2021-07-261-3/+2
| * | | submodule--helper: introduce add-clone subcommandAtharva Raykar2021-07-121-0/+177
| * | | submodule--helper: refactor module_clone()Atharva Raykar2021-07-121-113/+128
* | | | Merge branch 'tb/reverse-midx'Junio C Hamano2021-07-281-1/+1
|\ \ \ \
| * | | | multi-pack-index: fix potential segfault without sub-commandTaylor Blau2021-07-201-1/+1
* | | | | Merge branch 'ds/status-with-sparse-index'Junio C Hamano2021-07-281-0/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | status: use sparse-index throughoutDerrick Stolee2021-07-141-0/+3
* | | | | Merge branch 'dl/diff-merge-base'Junio C Hamano2021-07-281-2/+2
|\ \ \ \ \
| * | | | | git-diff: fix missing --merge-base docsDenton Liu2021-07-121-2/+2
* | | | | | Merge branch 'ab/attribute-format'Junio C Hamano2021-07-284-6/+6
|\ \ \ \ \ \
| * | | | | | *.c static functions: add missing __attribute__((format))Ævar Arnfjörð Bjarmason2021-07-142-0/+3
| * | | | | | *.c static functions: don't forward-declare __attribute__Ævar Arnfjörð Bjarmason2021-07-122-6/+3
* | | | | | | Merge branch 'jk/log-decorate-optim'Junio C Hamano2021-07-281-0/+3
|\ \ \ \ \ \ \
| * | | | | | | log: avoid loading decorations for userformats that don't need itJeff King2021-06-291-0/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'sm/worktree-add-lock'Junio C Hamano2021-07-281-5/+16
|\ \ \ \ \ \ \
| * | | | | | | worktree: teach `add` to accept --reason <string> with --lockStephen Manz2021-07-151-5/+16
| * | | | | | | worktree: mark lock strings with `_()` for translationStephen Manz2021-07-141-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'hj/commit-allow-empty-message'Junio C Hamano2021-07-281-11/+18
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | commit: remove irrelavent prompt on `--allow-empty-message`Hu Jialun2021-07-091-9/+16
| * | | | | | commit: reorganise commit hint stringsHu Jialun2021-07-091-10/+10
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'bc/rev-list-without-commit-line'Junio C Hamano2021-07-221-9/+24
|\ \ \ \ \ \
| * | | | | | rev-list: add option for --pretty=format without headerbrian m. carlson2021-07-121-9/+24
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ab/struct-init'Junio C Hamano2021-07-176-14/+7
|\ \ \ \ \ \
| * | | | | | dir.[ch]: replace dir_init() with DIR_INITÆvar Arnfjörð Bjarmason2021-07-016-14/+7
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ar/help-micro-cleanup'Junio C Hamano2021-07-171-9/+8
|\ \ \ \ \ \
| * | | | | | help: convert git_cmd to page in one placeAndrei Rybak2021-07-061-9/+8
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ar/submodule-helper-include-cleanup'Junio C Hamano2021-07-171-1/+0
|\ \ \ \ \ \
| * | | | | | submodule--helper: remove redundant includeAtharva Raykar2021-07-061-1/+0
* | | | | | | Merge branch 'ab/bundle-updates'Junio C Hamano2021-07-171-27/+47
|\ \ \ \ \ \ \
| * | | | | | | bundle: remove "ref_list" in favor of string-list.c APIÆvar Arnfjörð Bjarmason2021-07-061-6/+6
| * | | | | | | bundle cmd: stop leaking memory from parse_options_cmd_bundle()Ævar Arnfjörð Bjarmason2021-07-061-21/+41
| | |/ / / / / | |/| | | | |