diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 02:20:59 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-23 01:10:06 +0200 |
| commit | 7976721d171e17330486b403e868b594cd238295 (patch) | |
| tree | b0a9b7a2921b96dcd3d34e99918389edc2402d79 /Documentation/git-merge-tree.txt | |
| parent | merge-tree: allow `ls-files -u` style info to be NUL terminated (diff) | |
| download | git-7976721d171e17330486b403e868b594cd238295.tar.xz git-7976721d171e17330486b403e868b594cd238295.zip | |
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>
Diffstat (limited to 'Documentation/git-merge-tree.txt')
| -rw-r--r-- | Documentation/git-merge-tree.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt index 75b57f8aba..628324646d 100644 --- a/Documentation/git-merge-tree.txt +++ b/Documentation/git-merge-tree.txt @@ -59,6 +59,11 @@ OPTIONS default is to include these messages if there are merge conflicts, and to omit them otherwise. +--allow-unrelated-histories:: + merge-tree will by default error out if the two branches specified + share no common history. This flag can be given to override that + check and make the merge proceed anyway. + [[OUTPUT]] OUTPUT ------ |