Commit Graph

  • 3cfb2558b6 Meta/Make: export SHELL as well as SHELL_PATH todo Junio C Hamano 2025-04-07 09:38:18 -0700
  • b025e09332 What's cooking (2025/04 #01) Junio C Hamano 2025-04-07 09:37:56 -0700
  • 1b09671a54 Merge branch 'ua/update-update-server-info' into seen seen Junio C Hamano 2025-04-01 22:56:47 +0900
  • 67202fa59b Merge branch 'kn/blame-porcelain-unblamable' into seen Junio C Hamano 2025-04-01 22:56:46 +0900
  • 2fab4d8112 Merge branch 'ab/rm-sign-compare' into seen Junio C Hamano 2025-04-01 22:56:46 +0900
  • 4b419c6537 Merge branch 'ib/diff-S-G-with-longhand' into seen Junio C Hamano 2025-04-01 22:56:45 +0900
  • fae5d4ce29 Merge branch 'jc/doc-attr-tree' into seen Junio C Hamano 2025-04-01 22:56:44 +0900
  • a93b104a4a Merge branch 'jt/rev-list-z' into seen Junio C Hamano 2025-04-01 22:56:44 +0900
  • 59f57ce28c Merge branch 'jt/ref-transaction-abort-fix' into seen Junio C Hamano 2025-04-01 22:56:43 +0900
  • 3b59fc1907 Merge branch 'ab/pathspec-sign-compare-workaround' into jch Junio C Hamano 2025-04-01 22:56:21 +0900
  • 0e7926a440 Merge branch 'ps/reftable-api-revamp' into jch Junio C Hamano 2025-04-01 22:56:19 +0900
  • bc4a244e47 Notes added by 'git notes copy' Junio C Hamano 2025-04-01 22:55:07 +0900
  • 4f6be68fb8 reftable/table: move printing logic into test helper Patrick Steinhardt 2025-03-31 10:41:34 +0200
  • 8d40c29131 reftable/constants: make block types part of the public interface Patrick Steinhardt 2025-03-31 10:41:33 +0200
  • eca1133a27 SQUASH??? Junio C Hamano 2025-04-01 22:54:34 +0900
  • 937fe0a1f9 Merge branch 'en/merge-recursive-debug' into jch Junio C Hamano 2025-04-01 21:37:03 +0900
  • d50fb55319 Merge branch 'bc/allow-upload-pack-from-other-people' into jch Junio C Hamano 2025-04-01 21:37:02 +0900
  • 6deb68ae1f Merge branch 'md/userdiff-bash-shell-function' into jch Junio C Hamano 2025-04-01 21:37:01 +0900
  • 10c431f7ef Merge branch 'mh/left-right-limited' into jch Junio C Hamano 2025-04-01 21:37:00 +0900
  • 521500a2ad Merge branch 'ja/doc-reset-mv-rm-markup-updates' into jch Junio C Hamano 2025-04-01 21:34:19 +0900
  • 6cc0c60ed2 Merge branch 'ps/cat-file-filter-batch' into jch Junio C Hamano 2025-04-01 21:33:15 +0900
  • fd2052b9dd Merge branch 'ps/test-wo-perl-prereq' into jch Junio C Hamano 2025-04-01 21:33:14 +0900
  • 5226c7633d Merge branch 'jt/help-sha-backend-info-in-build-options' into jch Junio C Hamano 2025-04-01 21:33:14 +0900
  • 7c25ea7956 Merge branch 'pb/status-rebase-fixes' into jch Junio C Hamano 2025-04-01 21:33:13 +0900
  • 7437e08583 Merge branch 'pb/perf-test-fixes' into jch Junio C Hamano 2025-04-01 21:33:13 +0900
  • 61cd162dca Merge branch 'ps/misc-build-fixes' into jch Junio C Hamano 2025-04-01 21:33:12 +0900
  • 365b0942e9 Merge branch 'pw/custom-conflict-marker-size-for-merge-related-docs' into jch Junio C Hamano 2025-04-01 21:33:12 +0900
  • a2973e5ffa Merge branch 'kn/non-transactional-batch-updates' into jch Junio C Hamano 2025-04-01 21:33:12 +0900
  • 9ce350666a Merge branch 'js/range-check-codeql-workaround' into jch Junio C Hamano 2025-04-01 21:33:11 +0900
  • 014e931ffe Merge branch 'js/comma-semicolon-confusion' into jch Junio C Hamano 2025-04-01 21:33:11 +0900
  • 78d60fbc72 Merge branch 'jt/clone-guess-remote-head-fix' into jch Junio C Hamano 2025-04-01 21:33:11 +0900
  • b4f40248c8 Merge branch 'zy/send-email-error-handling' into jch Junio C Hamano 2025-04-01 21:33:10 +0900
  • 1df0e663f2 Merge branch 'ds/maintenance-loose-objects-batchsize' into jch Junio C Hamano 2025-04-01 21:33:10 +0900
  • f02e6c54fe Merge branch 'lo/userdiff-gitconfig' into jch Junio C Hamano 2025-04-01 21:33:10 +0900
  • 914bd6fd91 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:17:34 -0700
  • 58636b83a9 builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM Elijah Newren 2025-03-31 15:51:19 +0000
  • 3bbb9e2a91 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:17:30 -0700
  • eebe2f4cba tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm Elijah Newren 2025-03-31 15:51:18 +0000
  • 1c46657896 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:17:29 -0700
  • ed9ac9671f merge-recursive.[ch]: thoroughly debug these Elijah Newren 2025-03-31 15:51:17 +0000
  • 8e68c99325 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:17:29 -0700
  • babe9f0708 merge, sequencer: switch recursive merges over to ort Elijah Newren 2025-03-31 15:51:16 +0000
  • 511360abe3 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:17:29 -0700
  • 5b2f2e4c3c sequencer: switch non-recursive merges over to ort Elijah Newren 2025-03-31 15:51:15 +0000
  • a090d9ac1d Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:17:29 -0700
  • 5750be7803 merge-ort: enable diff-algorithms other than histogram Elijah Newren 2025-03-31 15:51:14 +0000
  • 9c966a18ab Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:17:28 -0700
  • 12c4d61b66 builtin/merge-recursive: switch to using merge_ort_generic() Elijah Newren 2025-03-31 15:51:13 +0000
  • afd149e5b7 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:17:28 -0700
  • 1d6e34a607 checkout: replace merge_trees() with merge_ort_nonrecursive() Elijah Newren 2025-03-31 15:51:12 +0000
  • 95b573b753 t5605: fix test for cloning from a different user brian m. carlson 2025-03-31 21:53:58 +0000
  • 9efea4066e Notes added by 'git notes add' Junio C Hamano 2025-04-01 19:13:42 +0900
  • e82d1a43a5 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:09:06 -0700
  • 39bd0da606 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:30 -0700
  • 8475ca3bee Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:30 -0700
  • 17221825f8 reftable/table: introduce iterator for table blocks Patrick Steinhardt 2025-03-31 10:41:32 +0200
  • 19dd0760a8 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:29 -0700
  • 0a502c5328 reftable/table: add `reftable_table` to the public interface Patrick Steinhardt 2025-03-31 10:41:31 +0200
  • f00bbaa236 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:29 -0700
  • 7f9ee48a00 reftable/block: expose a generic iterator over reftable records Patrick Steinhardt 2025-03-31 10:41:30 +0200
  • 6654b35f4d Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:29 -0700
  • 9666633c6c reftable/block: make block iterators reseekable Patrick Steinhardt 2025-03-31 10:41:29 +0200
  • 229dcd766e Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:29 -0700
  • 9cbd3c9a3a reftable/block: store block pointer in the block iterator Patrick Steinhardt 2025-03-31 10:41:28 +0200
  • f67792459e Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:28 -0700
  • 93e8394bed reftable/block: create public interface for reading blocks Patrick Steinhardt 2025-03-31 10:41:27 +0200
  • d807e55154 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:28 -0700
  • fab8095776 git-zlib: use `struct z_stream_s` instead of typedef Patrick Steinhardt 2025-03-31 10:41:26 +0200
  • 8a91b13057 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:28 -0700
  • 3473d2f587 reftable/block: rename `block_reader` to `reftable_block` Patrick Steinhardt 2025-03-31 10:41:25 +0200
  • 3ed70040db Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:28 -0700
  • e3525f53b1 reftable/block: rename `block` to `block_data` Patrick Steinhardt 2025-03-31 10:41:24 +0200
  • 0c7c8b60fd Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:27 -0700
  • 5434e86fbf reftable/table: move reading block into block reader Patrick Steinhardt 2025-03-31 10:41:23 +0200
  • a8c49ae4e9 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:27 -0700
  • 8a1dad4a05 reftable/block: simplify how we track restart points Patrick Steinhardt 2025-03-31 10:41:22 +0200
  • 1aae8d9b50 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:27 -0700
  • e7afe0069f reftable/blocksource: consolidate code into a single file Patrick Steinhardt 2025-03-31 10:41:21 +0200
  • 296fbde8d6 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:27 -0700
  • 0a15dbbe49 reftable/reader: rename data structure to "table" Patrick Steinhardt 2025-03-31 10:41:20 +0200
  • 682bf551ad Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:26 -0700
  • ea46754024 reftable: fix formatting of the license header Patrick Steinhardt 2025-03-31 10:41:19 +0200
  • ca20a56298 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:05:26 -0700
  • c7c4e5e419 Merge branch 'ps/reftable-sans-compat-util' into ps/reftable-api-revamp Junio C Hamano 2025-04-01 19:05:13 +0900
  • fca3bc1d91 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:03:01 -0700
  • e668d216c5 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:03:01 -0700
  • 6f6e6a5a93 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:03:01 -0700
  • e7d9bfd694 Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:03:00 -0700
  • 1e26e9ca2b Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:03:00 -0700
  • 43380056df userdiff: add builtin driver for INI files Lucas Seiki Oshiro 2025-03-31 00:13:09 -0300
  • a7adb8205e Notes added by 'git notes add' Junio C Hamano 2025-04-01 03:02:09 -0700
  • 83ea581f4c doc: convert git-mv to new documentation format Jean-Noël Avila 2025-03-30 17:16:04 +0000
  • c4009471b2 Notes added by 'git notes add' Junio C Hamano 2025-04-01 02:58:52 -0700
  • 7207ffc967 doc: move synopsis git-mv commands in the synopsis section Jean-Noël Avila 2025-03-30 17:16:03 +0000
  • 8d160e6b35 Notes added by 'git notes add' Junio C Hamano 2025-04-01 02:58:52 -0700
  • 78d1c4536b doc: convert git-rm to new documentation format Jean-Noël Avila 2025-03-30 17:16:02 +0000
  • 12eed33931 Notes added by 'git notes add' Junio C Hamano 2025-04-01 02:58:52 -0700
  • 6721e7c4c7 doc: fix synopsis analysis logic Jean-Noël Avila 2025-03-30 17:16:01 +0000
  • 4f607e9640 Notes added by 'git notes add' Junio C Hamano 2025-04-01 02:58:51 -0700
  • d823a746d3 doc: convert git-reset to new documentation format Jean-Noël Avila 2025-03-30 17:16:00 +0000