path: root/Documentation
diff options
authorJunio C Hamano <>2015-04-21 19:12:17 (GMT)
committerJunio C Hamano <>2015-04-21 19:12:17 (GMT)
commite9ab76da8f9ec1b4312de87bc68a1c4bcbf10329 (patch)
tree1cc8c75f4b7e5d4de5d0eb3c843e0cc9925310fe /Documentation
parent52735a689270bb1de94eb3de198594b36caed9bb (diff)
parent9585cb8d964a1f17895d58b280b5adf62265be53 (diff)
Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint
Documentation update. * jn/doc-fast-import-no-16-octopus-limit: fast-import doc: remove suggested 16-parent limit
Diffstat (limited to 'Documentation')
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index f71fb01..690fed3 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -507,10 +507,6 @@ omitted when creating a new branch, the first `merge` commit will be
the first ancestor of the current commit, and the branch will start
out with no files. An unlimited number of `merge` 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 `merge`
-commands per commit; 16, if starting a new, empty branch.
Here `<commit-ish>` is any of the commit specification expressions
also accepted by `from` (see above).