diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-04-14 14:45:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-14 14:45:21 -0700 |
| commit | e35ff42a5adbd14aa3edb2985668520e140ce6ac (patch) | |
| tree | be8d032a4581e64e485a526e5a8801f9c5f09d57 /git-fast-import.html | |
| parent | 8ea9ba9e904e3716899f808461af29a6ea279a6a (diff) | |
| download | git-htmldocs-e35ff42a5adbd14aa3edb2985668520e140ce6ac.tar.gz | |
Autogenerated HTML docs for v2.4.0-rc2
Diffstat (limited to 'git-fast-import.html')
| -rw-r--r-- | git-fast-import.html | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/git-fast-import.html b/git-fast-import.html index ee6533b3c..8cc3e1c91 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -1396,11 +1396,7 @@ If the <code>from</code> command is omitted when creating a new branch, the first <code>merge</code> commit will be
the first ancestor of the current commit, and the branch will start
out with no files. An unlimited number of <code>merge</code> commands per
-commit are permitted by fast-import, thereby establishing an n-way merge.
-However Git’s other tools never create commits with more than 15
-additional ancestors (forming a 16-way merge). For this reason
-it is suggested that frontends do not use more than 15 <code>merge</code>
-commands per commit; 16, if starting a new, empty branch.</p></div>
+commit are permitted by fast-import, thereby establishing an n-way merge.</p></div>
<div class="paragraph"><p>Here <code><commit-ish></code> is any of the commit specification expressions
also accepted by <code>from</code> (see above).</p></div>
</div>
@@ -2458,7 +2454,7 @@ compression.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-11-19 15:05:50 PST
+Last updated 2015-04-14 14:41:37 PDT
</div>
</div>
</body>
|