Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | midx-write.c: check count of packs to repack after grouping | Taylor Blau | 2024-04-01 | 1 | -24/+20 |
* | midx-write.c: factor out common want_included_pack() routine | Taylor Blau | 2024-04-01 | 1 | -12/+20 |
* | midx-write: move writing-related functions from midx.c | Taylor Blau | 2024-04-01 | 4 | -1539/+1555 |
* | Merge branch 'rs/midx-use-strvec-pushf' into tb/midx-write | Junio C Hamano | 2024-04-01 | 1 | -6/+1 |
|\ | |||||
| * | midx: use strvec_pushf() for pack-objects base name | René Scharfe | 2024-03-25 | 1 | -6/+1 |
* | | The thirteenth batch | Junio C Hamano | 2024-04-01 | 1 | -0/+26 |
* | | Merge branch 'ps/clone-with-includeif-onbranch' | Junio C Hamano | 2024-04-01 | 1 | -0/+12 |
|\ \ | |||||
| * | | t5601: exercise clones with "includeIf.*.onbranch" | Patrick Steinhardt | 2024-03-12 | 1 | -0/+12 |
* | | | Merge branch 'jk/rebase-apply-leakfix' | Junio C Hamano | 2024-04-01 | 2 | -3/+12 |
|\ \ \ | |||||
| * | | | rebase: use child_process_clear() to clean | Jeff King | 2024-03-22 | 2 | -3/+12 |
* | | | | Merge branch 'ps/t7800-variable-interpolation-fix' | Junio C Hamano | 2024-04-01 | 2 | -20/+40 |
|\ \ \ \ | |||||
| * | | | | t/README: document how to loop around test cases | Patrick Steinhardt | 2024-03-22 | 1 | -0/+20 |
| * | | | | t7800: use single quotes for test bodies | Patrick Steinhardt | 2024-03-22 | 1 | -20/+20 |
| * | | | | t7800: improve test descriptions with empty arguments | Patrick Steinhardt | 2024-03-22 | 1 | -8/+8 |
* | | | | | Merge branch 'ps/reftable-unit-test-nfs-workaround' | Junio C Hamano | 2024-04-01 | 1 | -1/+11 |
|\ \ \ \ \ | |||||
| * | | | | | reftable: fix tests being broken by NFS' delete-after-close semantics | Patrick Steinhardt | 2024-03-21 | 1 | -1/+11 |
* | | | | | | Merge branch 'jk/doc-remote-helpers-markup-fix' | Junio C Hamano | 2024-04-01 | 1 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | doc/gitremote-helpers: fix more missing single-quotes | Jeff King | 2024-03-20 | 1 | -3/+3 |
* | | | | | | | Merge branch 'pb/advice-merge-conflict' | Junio C Hamano | 2024-04-01 | 9 | -25/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | builtin/am: allow disabling conflict advice | Philippe Blain | 2024-03-18 | 3 | -10/+14 |
| * | | | | | | | sequencer: allow disabling conflict advice | Philippe Blain | 2024-03-18 | 6 | -15/+25 |
* | | | | | | | | Merge branch 'ds/config-internal-whitespace-fix' | Junio C Hamano | 2024-04-01 | 3 | -21/+136 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | config.txt: describe handling of whitespace further | Dragan Simic | 2024-03-21 | 1 | -13/+15 |
| * | | | | | | | | t1300: add more tests for whitespace and inline comments | Dragan Simic | 2024-03-21 | 1 | -3/+111 |
| * | | | | | | | | config: really keep value-internal whitespace verbatim | Dragan Simic | 2024-03-21 | 1 | -4/+9 |
| * | | | | | | | | config: minor addition of whitespace | Dragan Simic | 2024-03-21 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'jk/pretty-subject-cleanup' | Junio C Hamano | 2024-04-01 | 7 | -46/+38 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | format-patch: fix leak of empty header string | Jeff King | 2024-03-22 | 1 | -1/+1 |
| * | | | | | | | | | format-patch: simplify after-subject MIME header handling | Jeff King | 2024-03-20 | 1 | -8/+6 |
| * | | | | | | | | | format-patch: return an allocated string from log_write_email_headers() | Jeff King | 2024-03-20 | 4 | -7/+9 |
| * | | | | | | | | | log: do not set up extra_headers for non-email formats | Jeff King | 2024-03-20 | 1 | -3/+1 |
| * | | | | | | | | | pretty: drop print_email_subject flag | Jeff King | 2024-03-20 | 5 | -16/+9 |
| * | | | | | | | | | pretty: split oneline and email subject printing | Jeff King | 2024-03-20 | 3 | -15/+17 |
| * | | | | | | | | | shortlog: stop setting pp.print_email_subject | Jeff King | 2024-03-20 | 1 | -1/+0 |
* | | | | | | | | | | Merge branch 'pw/checkout-conflict-errorfix' | Junio C Hamano | 2024-04-01 | 9 | -37/+139 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | checkout: fix interaction between --conflict and --merge | Phillip Wood | 2024-03-14 | 2 | -3/+67 |
| * | | | | | | | | | | checkout: cleanup --conflict=<style> parsing | Phillip Wood | 2024-03-14 | 2 | -19/+38 |
| * | | | | | | | | | | merge options: add a conflict style member | Phillip Wood | 2024-03-14 | 5 | -2/+12 |
| * | | | | | | | | | | merge-ll: introduce LL_MERGE_OPTIONS_INIT | Phillip Wood | 2024-03-14 | 5 | -5/+6 |
| * | | | | | | | | | | xdiff-interface: refactor parsing of merge.conflictstyle | Phillip Wood | 2024-03-14 | 2 | -11/+19 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | The twelfth batch | Junio C Hamano | 2024-03-28 | 1 | -0/+18 |
* | | | | | | | | | | Merge branch 'jk/drop-hg-to-git' | Junio C Hamano | 2024-03-28 | 2 | -275/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | contrib: drop hg-to-git script | Jeff King | 2024-03-20 | 2 | -275/+0 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'rs/t-prio-queue-fixes' | Junio C Hamano | 2024-03-28 | 1 | -7/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t-prio-queue: check result array bounds | René Scharfe | 2024-03-18 | 1 | -3/+11 |
| * | | | | | | | | | | t-prio-queue: shorten array index message | René Scharfe | 2024-03-18 | 1 | -4/+6 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'bt/fuzz-config-parse' | Junio C Hamano | 2024-03-28 | 4 | -1/+36 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fuzz: add fuzzer for config parsing | Brian C Tracy | 2024-03-15 | 4 | -1/+36 |
* | | | | | | | | | | | Merge branch 'jc/show-untracked-false' | Junio C Hamano | 2024-03-28 | 6 | -30/+68 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | status: allow --untracked=false and friends | Junio C Hamano | 2024-03-13 | 5 | -12/+39 |