summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* The tenth batchJunio C Hamano2022-03-091-1/+27
* Merge branch 'ab/help-fixes'Junio C Hamano2022-03-095-24/+187
|\
| * help: don't print "\n" before single-section outputÆvar Arnfjörð Bjarmason2022-02-232-2/+4
| * help: add --no-[external-commands|aliases] for use with --allÆvar Arnfjörð Bjarmason2022-02-235-7/+66
| * help: error if [-a|-g|-c] and [-i|-m|-w] are combinedÆvar Arnfjörð Bjarmason2022-02-232-6/+45
| * help: correct usage & behavior of "git help --all"Ævar Arnfjörð Bjarmason2022-02-233-5/+8
| * help: note the option name on option incompatibilityÆvar Arnfjörð Bjarmason2022-02-231-7/+8
| * help.c: split up list_all_cmds_help() functionÆvar Arnfjörð Bjarmason2022-02-231-7/+20
| * help tests: test "git" and "git help [-a|-g] spacingÆvar Arnfjörð Bjarmason2022-02-231-0/+45
| * help.c: use puts() instead of printf{,_ln}() for consistencyÆvar Arnfjörð Bjarmason2022-02-231-3/+4
| * help doc: add missing "]" to "[-a|--all]"Ævar Arnfjörð Bjarmason2022-02-231-1/+1
* | Merge branch 'ab/c99-variadic-macros'Junio C Hamano2022-03-098-246/+65
|\ \
| * | C99: remove hardcoded-out !HAVE_VARIADIC_MACROS codeÆvar Arnfjörð Bjarmason2022-02-228-243/+64
| * | git-compat-util.h: clarify GCC v.s. C99-specific in commentÆvar Arnfjörð Bjarmason2022-02-221-3/+1
| |/
* | Merge branch 'hn/reftable-no-empty-keys'Junio C Hamano2022-03-097-19/+136
|\ \
| * | reftable: rename writer_stats to reftable_writer_statsHan-Wen Nienhuys2022-02-233-7/+7
| * | reftable: add test for length of disambiguating prefixHan-Wen Nienhuys2022-02-231-0/+38
| * | reftable: ensure that obj_id_len is >= 2 on writingHan-Wen Nienhuys2022-02-232-1/+40
| * | reftable: avoid writing empty keys at the block layerHan-Wen Nienhuys2022-02-233-12/+23
| * | reftable: add a test that verifies that writing empty keys failsHan-Wen Nienhuys2022-02-231-0/+24
| * | reftable: reject 0 object_id_lenHan-Wen Nienhuys2022-02-231-0/+5
| * | Documentation: object_id_len goes up to 31Han-Wen Nienhuys2022-02-231-1/+1
* | | Merge branch 'jc/cat-file-batch-commands'Junio C Hamano2022-03-093-22/+333
|\ \ \
| * | | cat-file: add --batch-command modeJohn Cai2022-02-183-6/+300
| * | | cat-file: add remove_timestamp helperJohn Cai2022-02-181-5/+10
| * | | cat-file: introduce batch_mode enum to replace print_contentsJohn Cai2022-02-181-4/+16
| * | | cat-file: rename cmdmode to transform_modeJohn Cai2022-02-181-7/+7
* | | | Merge branch 'pw/xdiff-alloc-fail'Junio C Hamano2022-03-094-48/+51
|\ \ \ \
| * | | | xdiff: handle allocation failure when mergingPhillip Wood2022-02-161-1/+6
| * | | | xdiff: refactor a functionPhillip Wood2022-02-161-19/+16
| * | | | xdiff: handle allocation failure in patience diffPhillip Wood2022-02-161-5/+12
| * | | | xdiff: fix a memory leakPhillip Wood2022-02-163-23/+17
* | | | | Merge branch 'en/present-despite-skipped'Junio C Hamano2022-03-0919-128/+311
|\ \ \ \ \
| * | | | | repo_read_index: add config to expect files outside sparse patternsElijah Newren2022-03-027-1/+66
| * | | | | Accelerate clear_skip_worktree_from_present_files() by cachingElijah Newren2022-01-141-2/+54
| * | | | | Update documentation related to sparsity and the skip-worktree bitElijah Newren2022-01-143-47/+98
| * | | | | repo_read_index: clear SKIP_WORKTREE bit from files present in worktreeElijah Newren2022-01-149-80/+72
| * | | | | unpack-trees: fix accidental loss of user changesElijah Newren2022-01-142-2/+4
| * | | | | t1011: add testcase demonstrating accidental loss of user modificationsElijah Newren2022-01-141-0/+21
| * | | | | Merge branch 'vd/sparse-clean-etc' into en/present-despite-skippedJunio C Hamano2022-01-138-17/+360
| |\ \ \ \ \
* | | | | | | The ninth batchJunio C Hamano2022-03-071-0/+21
* | | | | | | Merge branch 'jt/ls-files-stage-recurse'Junio C Hamano2022-03-073-4/+20
|\ \ \ \ \ \ \
| * | | | | | | ls-files: support --recurse-submodules --stageJonathan Tan2022-02-243-4/+20
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'gc/stash-on-branch-with-multi-level-name'Junio C Hamano2022-03-072-1/+12
|\ \ \ \ \ \ \
| * | | | | | | stash: strip "refs/heads/" with skip_prefixGlen Choo2022-02-242-1/+12
* | | | | | | | Merge branch 'ah/advice-switch-requires-detach-to-detach'Junio C Hamano2022-03-075-11/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | switch: mention the --detach option when dying due to lack of a branchAlex Henrie2022-02-265-11/+35
| |/ / / / / / /
* | | | | | | | Merge branch 'ab/c99-designated-initializers'Junio C Hamano2022-03-0711-183/+193
|\ \ \ \ \ \ \ \
| * | | | | | | | fast-import.c: use designated initializers for "partial" struct assignmentsÆvar Arnfjörð Bjarmason2022-02-251-4/+10
| * | | | | | | | refspec.c: use designated initializers for "struct refspec_item"Ævar Arnfjörð Bjarmason2022-02-251-7/+7