mirror
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
git/Documentation/technical
History
Junio C Hamano c3ebf18eb2 Merge branch 'en/merge-recursive-debug' 
Remove remnants of the recursive merge strategy backend, which was
superseded by the ort merge strategy.

* en/merge-recursive-debug:
  builtin/{merge,rebase,revert}: remove GIT_TEST_MERGE_ALGORITHM
  tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithm
  merge-recursive.[ch]: thoroughly debug these
  merge, sequencer: switch recursive merges over to ort
  sequencer: switch non-recursive merges over to ort
  merge-ort: enable diff-algorithms other than histogram
  builtin/merge-recursive: switch to using merge_ort_generic()
  checkout: replace merge_trees() with merge_ort_nonrecursive()
 		2025-04-17 10:28:18 -07:00
..
.gitignore doc: update gitignore for .adoc extension 2025-01-21 12:56:05 -08:00
api-error-handling.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
api-index-skel.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
api-index.sh doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
api-merge.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
api-parse-options.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
api-path-walk.adoc Merge branch 'ds/backfill' 2025-02-18 15:30:31 -08:00
api-simple-ipc.adoc doc: *.txt -> *.adoc fixes 2025-03-03 13:49:21 -08:00
api-trace2.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
bitmap-format.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
build-systems.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
bundle-uri.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
commit-graph.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
directory-rename-detection.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
hash-function-transition.adoc doc: *.txt -> *.adoc fixes 2025-03-03 13:49:21 -08:00
large-object-promisors.adoc Merge branch 'cc/lop-remote' 2025-03-05 10:37:44 -08:00
long-running-process-protocol.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
meson.build meson: fix building technical and howto docs 2025-03-03 08:38:05 -08:00
multi-pack-index.adoc Documentation: describe incremental MIDX bitmaps 2025-03-21 04:33:28 -07:00
pack-heuristics.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
packfile-uri.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
parallel-checkout.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
partial-clone.adoc technical/partial-clone: update reference to rev-list-options.adoc 2025-03-03 13:49:21 -08:00
platform-support.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
racy-git.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
reftable.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
remembering-renames.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
repository-version.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
rerere.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
scalar.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
send-pack-pipeline.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
shallow.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
sparse-checkout.adoc merge-recursive.[ch]: thoroughly debug these 2025-04-08 13:59:13 -07:00
sparse-index.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
trivial-merge.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
unit-tests.adoc doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00