| commit | 80754c5cc05955dd0159fa40d7b82b2802a4deba | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 May 2023 20:59:06 +0000 (15 13:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 May 2023 20:59:06 +0000 (15 13:59 -0700) | ||
| tree | 68197d59a89c0d32ad358c17a97cffe1ccb6ea71 | treesnapshot (tar.gz zip) |
| parent | db13ea835b056afa13ab96c9f96dce011ecc328a | commitdiff |
| parent | b6551feadfda76379a28f424ea46998e2b995d07 | commitdiff |
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
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 | blobhistory |