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 /git-pull.html | |
| parent | bdb842448583ab00b1e86b483533188f874d084b (diff) | |
| download | git-htmldocs-7921e7c3e6413772a6b533c968cb9389ccd1e5e0.tar.gz | |
Autogenerated HTML docs for v2.8.2-294-gbbc61
Diffstat (limited to 'git-pull.html')
| -rw-r--r-- | git-pull.html | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/git-pull.html b/git-pull.html index b6c4e3bc1..c1e558d45 100644 --- a/git-pull.html +++ b/git-pull.html @@ -1022,6 +1022,19 @@ option can be used to override --squash.</p></div> </p>
</dd>
<dt class="hdlist1">
+--allow-unrelated-histories
+</dt>
+<dd>
+<p>
+ By default, <code>git merge</code> 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.
+</p>
+</dd>
+<dt class="hdlist1">
-r
</dt>
<dt class="hdlist1">
|