fast-import doc: remove suggested 16-parent limit
Merges with an absurd number of parents are still a bad idea because they do not render well in tools like gitk, but if they are present in the repository being imported into git then there's no need to avoid reproducing them faithfully. In olden times, before v1.6.0-rc0~194 (2008-06-27), git commit-tree and higher-level tools built on top of it were limited to writing 16 parents for a commit. Nowadays normal git operations are happy to write more parents when asked, so the motivation for this note in the fast-import documentation is gone and we can remove it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Mar 31, 2015 at 16:18 UTC
9585cb8d964a1f17895d58b280b5adf62265be53
1 file changed
-4
Documentation/git-fast-import.txt
-4
@@ -504,10 +504,6 @@ omitted when creating a new branch, the first `merge` commit will be
504
the first ancestor of the current commit, and the branch will start
505
out with no files. An unlimited number of `merge` commands per
506
commit are permitted by fast-import, thereby establishing an n-way merge.
507
-However Git's other tools never create commits with more than 15
508
-additional ancestors (forming a 16-way merge). For this reason
509
-it is suggested that frontends do not use more than 15 `merge`
510
-commands per commit; 16, if starting a new, empty branch.
507
508
Here `<commit-ish>` is any of the commit specification expressions
509
also accepted by `from` (see above).