| commit | 7976721d171e17330486b403e868b594cd238295 | |
| author | Elijah Newren <newren@gmail.com> | |
| Sat, 18 Jun 2022 00:20:59 +0000 (18 00:20 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Jun 2022 23:10:06 +0000 (22 16:10 -0700) | ||
| tree | b0a9b7a2921b96dcd3d34e99918389edc2402d79 | treesnapshot (tar.gz zip) |
| parent | 7c48b27822b280222be1df7ec9f9e98d688f933b | commitdiff |
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>
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 | diffblobblamehistory | |
| builtin/merge-tree.c | diffblobblamehistory | |
| t/t4301-merge-tree-write-tree.sh | diffblobblamehistory |