]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7c48b27) | patch
merge-tree: add a --allow-unrelated-histories flag
authorElijah Newren <newren@gmail.com>
Sat, 18 Jun 2022 00:20:59 +0000 (00:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Jun 2022 23:10:06 +0000 (16:10 -0700)
commit7976721d171e17330486b403e868b594cd238295
treeb0a9b7a2921b96dcd3d34e99918389edc2402d79tree | snapshot
parent7c48b27822b280222be1df7ec9f9e98d688f933bcommit | diff
merge-tree: add a --allow-unrelated-histories flag

Folks may want to merge histories that have no common ancestry; provide
a flag with the same name as used by `git merge` to allow this.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge-tree.txt diff | blob | blame | history
builtin/merge-tree.c diff | blob | blame | history
t/t4301-merge-tree-write-tree.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.