diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-18 13:21:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-21 11:58:51 -0700 |
| commit | 09c2cb877a9cc0f6f25eac8d43663f4e8f3309a4 (patch) | |
| tree | 0e1a2e163c79237d21c8912c6af9c92b65bf8815 /Documentation/merge-options.txt | |
| parent | de224962148c6b32ea2a6eba85578cc16d6c86c1 (diff) | |
| download | git-09c2cb877a9cc0f6f25eac8d43663f4e8f3309a4.tar.gz git-09c2cb877a9cc0f6f25eac8d43663f4e8f3309a4.tar.xz | |
pull: pass --allow-unrelated-histories to "git merge"
The previous commit said:
We could add the same option to "git pull" and have it passed
through to underlying "git merge". I do not have a fundamental
opposition against such a feature, but this commit does not do
so and instead leaves it as low-hanging fruit for others,
because such a "two project merge" would be done after fetching
the other project into some location in the working tree of an
existing project and making sure how well they fit together, it
is sufficient to allow a local merge without such an option
pass-through from "git pull" to "git merge".
Prepare a patch to make it a reality, just in case it is needed.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
| -rw-r--r-- | Documentation/merge-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index f08e9b80c..dfb43d000 100644 --- a/Documentation/merge-options.txt +++ b/Documentation/merge-options.txt @@ -114,3 +114,11 @@ ifndef::git-pull[] reporting. endif::git-pull[] + +--allow-unrelated-histories:: + By default, `git merge` command refuses to merge histories + that do not share a common ancestor. This option can be + used to override this safety when merging histories of two + projects that started their lives independently. As that is + a very rare occasion, no configuration variable to enable + this by default exists and will not be added. |