Skip to content

Commit 9585cb8

Browse files
jrngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e156455 commit 9585cb8

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

Documentation/git-fast-import.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -504,10 +504,6 @@ omitted when creating a new branch, the first `merge` commit will be
504504
the first ancestor of the current commit, and the branch will start
505505
out with no files. An unlimited number of `merge` commands per
506506
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.
511507

512508
Here `<commit-ish>` is any of the commit specification expressions
513509
also accepted by `from` (see above).

0 commit comments

Comments
 (0)