diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-29 14:55:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-29 14:55:09 -0700 |
| commit | 7921e7c3e6413772a6b533c968cb9389ccd1e5e0 (patch) | |
| tree | 5dd90487649622f29462e7769a398e02e6bf64f2 /merge-options.txt | |
| parent | bdb842448583ab00b1e86b483533188f874d084b (diff) | |
| download | git-htmldocs-7921e7c3e6413772a6b533c968cb9389ccd1e5e0.tar.gz | |
Autogenerated HTML docs for v2.8.2-294-gbbc61
Diffstat (limited to 'merge-options.txt')
| -rw-r--r-- | merge-options.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/merge-options.txt b/merge-options.txt index f08e9b80c..dfb43d000 100644 --- a/merge-options.txt +++ b/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. |