]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db13ea8 b6551fe)
Merge branch 'ds/merge-tree-use-config'
authorJunio C Hamano <gitster@pobox.com>
Mon, 15 May 2023 20:59:06 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 15 May 2023 20:59:06 +0000 (13:59 -0700)
commit80754c5cc05955dd0159fa40d7b82b2802a4deba
tree68197d59a89c0d32ad358c17a97cffe1ccb6ea71tree | snapshot
parentdb13ea835b056afa13ab96c9f96dce011ecc328acommit | diff
parentb6551feadfda76379a28f424ea46998e2b995d07commit | diff
Merge branch 'ds/merge-tree-use-config'

Allow git forges to disable replace-refs feature while running "git
merge-tree".

* ds/merge-tree-use-config:
  merge-tree: load default git config
builtin/merge-tree.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.