mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jn/doc-fast-import-no-16-octopus-limit'
Documentation update. * jn/doc-fast-import-no-16-octopus-limit: fast-import doc: remove suggested 16-parent limit
This commit is contained in:
commit
0cb7054e75
|
@ -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).
|
||||
|
|
Loading…
Reference in a new issue