summaryrefslogtreecommitdiffstats
path: root/builtin (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/commit-graph-verify-fix'Junio C Hamano2023-10-041-7/+24
|\
| * commit-graph: report incomplete chains during verificationJeff King2023-09-281-1/+9
| * commit-graph: detect read errors when verifying graph chainJeff King2023-09-281-7/+16
* | Merge branch 'jc/unresolve-removal'Junio C Hamano2023-10-022-90/+23
|\ \
| * | checkout: allow "checkout -m path" to unmerge removed pathsJunio C Hamano2023-08-012-5/+3
| * | checkout/restore: refuse unmerging paths unless checking out of the indexJunio C Hamano2023-08-011-0/+9
| * | update-index: remove stale fallback code for "--unresolve"Junio C Hamano2023-08-011-102/+12
| * | update-index: use unmerge_index_entry() to support removalJunio C Hamano2023-08-011-16/+22
| * | update-index: do not read HEAD and MERGE_HEAD unconditionallyJunio C Hamano2023-08-011-18/+28
* | | Merge branch 'ob/am-msgfix'Junio C Hamano2023-09-291-1/+2
|\ \ \
| * | | am: fix error message in parse_opt_show_current_patch()Oswald Buddenhagen2023-09-211-1/+2
* | | | Merge branch 'ds/stat-name-width-configuration'Junio C Hamano2023-09-294-0/+4
|\ \ \ \
| * | | | diff --stat: add config option to limit filename widthDragan Simic2023-09-184-0/+4
* | | | | Merge branch 'jk/fsmonitor-unused-parameter'Junio C Hamano2023-09-291-4/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | run-command: mark unused parameters in start_bg_wait callbacksJeff King2023-09-191-1/+2
| * | | | fsmonitor: mark unused hashmap callback parametersJeff King2023-09-191-2/+3
| * | | | fsmonitor: mark some maybe-unused parametersJeff King2023-09-191-1/+1
| | |/ / | |/| |
* | | | Merge branch 'tb/repack-existing-packs-cleanup'Junio C Hamano2023-09-231-113/+180
|\ \ \ \
| * | | | builtin/repack.c: extract common cruft pack loopTaylor Blau2023-09-131-13/+18
| * | | | builtin/repack.c: avoid directly inspecting "util"Taylor Blau2023-09-131-4/+14
| * | | | builtin/repack.c: store existing cruft packs separatelyTaylor Blau2023-09-131-16/+23
| * | | | builtin/repack.c: extract `has_existing_non_kept_packs()`Taylor Blau2023-09-131-1/+7
| * | | | builtin/repack.c: extract redundant pack cleanup for existing packsTaylor Blau2023-09-131-17/+28
| * | | | builtin/repack.c: extract redundant pack cleanup for --geometricTaylor Blau2023-09-131-23/+29
| * | | | builtin/repack.c: extract marking packs for deletionTaylor Blau2023-09-131-18/+32
| * | | | builtin/repack.c: extract structure to store existing packsTaylor Blau2023-09-131-41/+49
* | | | | Merge branch 'jc/update-index-show-index-version'Junio C Hamano2023-09-201-6/+13
|\ \ \ \ \
| * | | | | update-index: add --show-index-versionJunio C Hamano2023-09-131-6/+13
| | |_|_|/ | |/| | |
* | | | | Merge branch 'js/systemd-timers-wsl-fix'Junio C Hamano2023-09-201-1/+1
|\ \ \ \ \
| * | | | | maintenance(systemd): support the Windows Subsystem for LinuxJohannes Schindelin2023-09-111-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs/grep-no-no-or'Junio C Hamano2023-09-181-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | grep: reject --no-orRené Scharfe2023-09-071-1/+1
* | | | | Merge branch 'rs/name-rev-use-opt-hidden-bool'Junio C Hamano2023-09-141-6/+2
|\ \ \ \ \
| * | | | | name-rev: use OPT_HIDDEN_BOOL for --peel-tagRené Scharfe2023-09-051-6/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'rs/grep-parseopt-simplify'Junio C Hamano2023-09-141-3/+2
|\ \ \ \ \
| * | | | | grep: use OPT_INTEGER_F for --max-depthRené Scharfe2023-09-051-3/+2
| |/ / / /
* | | | | Merge branch 'bc/more-git-var'Junio C Hamano2023-09-131-1/+1
|\ \ \ \ \
| * | | | | var: avoid a segmentation fault when `HOME` is unsetJohannes Schindelin2023-09-061-1/+1
* | | | | | Merge branch 'ew/hash-with-openssl-evp'Junio C Hamano2023-09-133-2/+9
|\ \ \ \ \ \
| * | | | | | treewide: fix various bugs w/ OpenSSL 3+ EVP APIEric Wong2023-09-013-2/+9
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/unused-post-2.42-part2'Junio C Hamano2023-09-1312-105/+93
|\ \ \ \ \ \
| * | | | | | interpret-trailers: mark unused "unset" parameters in option callbacksJeff King2023-09-051-3/+6
| * | | | | | parse-options: add more BUG_ON() annotationsJeff King2023-09-052-0/+4
| * | | | | | merge: do not pass unused opt->value parameterJeff King2023-09-051-1/+1
| * | | | | | parse-options: mark unused "opt" parameter in callbacksJeff King2023-09-056-12/+14
| * | | | | | parse-options: prefer opt->value to globals in callbacksJeff King2023-09-056-37/+50
| * | | | | | checkout-index: delay automatic setting of to_tempfileJeff King2023-09-051-2/+7
| * | | | | | format-patch: use OPT_STRING_LIST for to/cc optionsJeff King2023-09-011-20/+2
| * | | | | | merge: simplify parsing of "-n" optionJeff King2023-09-011-11/+2
| * | | | | | merge: make xopts a strvecJeff King2023-09-011-19/+7