summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* midx-write.c: check count of packs to repack after groupingTaylor Blau2024-04-011-24/+20
* midx-write.c: factor out common want_included_pack() routineTaylor Blau2024-04-011-12/+20
* midx-write: move writing-related functions from midx.cTaylor Blau2024-04-014-1539/+1555
* Merge branch 'rs/midx-use-strvec-pushf' into tb/midx-writeJunio C Hamano2024-04-011-6/+1
|\
| * midx: use strvec_pushf() for pack-objects base nameRené Scharfe2024-03-251-6/+1
* | The thirteenth batchJunio C Hamano2024-04-011-0/+26
* | Merge branch 'ps/clone-with-includeif-onbranch'Junio C Hamano2024-04-011-0/+12
|\ \
| * | t5601: exercise clones with "includeIf.*.onbranch"Patrick Steinhardt2024-03-121-0/+12
* | | Merge branch 'jk/rebase-apply-leakfix'Junio C Hamano2024-04-012-3/+12
|\ \ \
| * | | rebase: use child_process_clear() to cleanJeff King2024-03-222-3/+12
* | | | Merge branch 'ps/t7800-variable-interpolation-fix'Junio C Hamano2024-04-012-20/+40
|\ \ \ \
| * | | | t/README: document how to loop around test casesPatrick Steinhardt2024-03-221-0/+20
| * | | | t7800: use single quotes for test bodiesPatrick Steinhardt2024-03-221-20/+20
| * | | | t7800: improve test descriptions with empty argumentsPatrick Steinhardt2024-03-221-8/+8
* | | | | Merge branch 'ps/reftable-unit-test-nfs-workaround'Junio C Hamano2024-04-011-1/+11
|\ \ \ \ \
| * | | | | reftable: fix tests being broken by NFS' delete-after-close semanticsPatrick Steinhardt2024-03-211-1/+11
* | | | | | Merge branch 'jk/doc-remote-helpers-markup-fix'Junio C Hamano2024-04-011-3/+3
|\ \ \ \ \ \
| * | | | | | doc/gitremote-helpers: fix more missing single-quotesJeff King2024-03-201-3/+3
* | | | | | | Merge branch 'pb/advice-merge-conflict'Junio C Hamano2024-04-019-25/+39
|\ \ \ \ \ \ \
| * | | | | | | builtin/am: allow disabling conflict advicePhilippe Blain2024-03-183-10/+14
| * | | | | | | sequencer: allow disabling conflict advicePhilippe Blain2024-03-186-15/+25
* | | | | | | | Merge branch 'ds/config-internal-whitespace-fix'Junio C Hamano2024-04-013-21/+136
|\ \ \ \ \ \ \ \
| * | | | | | | | config.txt: describe handling of whitespace furtherDragan Simic2024-03-211-13/+15
| * | | | | | | | t1300: add more tests for whitespace and inline commentsDragan Simic2024-03-211-3/+111
| * | | | | | | | config: really keep value-internal whitespace verbatimDragan Simic2024-03-211-4/+9
| * | | | | | | | config: minor addition of whitespaceDragan Simic2024-03-211-1/+1
* | | | | | | | | Merge branch 'jk/pretty-subject-cleanup'Junio C Hamano2024-04-017-46/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | format-patch: fix leak of empty header stringJeff King2024-03-221-1/+1
| * | | | | | | | | format-patch: simplify after-subject MIME header handlingJeff King2024-03-201-8/+6
| * | | | | | | | | format-patch: return an allocated string from log_write_email_headers()Jeff King2024-03-204-7/+9
| * | | | | | | | | log: do not set up extra_headers for non-email formatsJeff King2024-03-201-3/+1
| * | | | | | | | | pretty: drop print_email_subject flagJeff King2024-03-205-16/+9
| * | | | | | | | | pretty: split oneline and email subject printingJeff King2024-03-203-15/+17
| * | | | | | | | | shortlog: stop setting pp.print_email_subjectJeff King2024-03-201-1/+0
* | | | | | | | | | Merge branch 'pw/checkout-conflict-errorfix'Junio C Hamano2024-04-019-37/+139
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | checkout: fix interaction between --conflict and --mergePhillip Wood2024-03-142-3/+67
| * | | | | | | | | | checkout: cleanup --conflict=<style> parsingPhillip Wood2024-03-142-19/+38
| * | | | | | | | | | merge options: add a conflict style memberPhillip Wood2024-03-145-2/+12
| * | | | | | | | | | merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood2024-03-145-5/+6
| * | | | | | | | | | xdiff-interface: refactor parsing of merge.conflictstylePhillip Wood2024-03-142-11/+19
| |/ / / / / / / / /
* | | | | | | | | | The twelfth batchJunio C Hamano2024-03-281-0/+18
* | | | | | | | | | Merge branch 'jk/drop-hg-to-git'Junio C Hamano2024-03-282-275/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | contrib: drop hg-to-git scriptJeff King2024-03-202-275/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rs/t-prio-queue-fixes'Junio C Hamano2024-03-281-7/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t-prio-queue: check result array boundsRené Scharfe2024-03-181-3/+11
| * | | | | | | | | | t-prio-queue: shorten array index messageRené Scharfe2024-03-181-4/+6
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'bt/fuzz-config-parse'Junio C Hamano2024-03-284-1/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fuzz: add fuzzer for config parsingBrian C Tracy2024-03-154-1/+36
* | | | | | | | | | | Merge branch 'jc/show-untracked-false'Junio C Hamano2024-03-286-30/+68
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | status: allow --untracked=false and friendsJunio C Hamano2024-03-135-12/+39