Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Apr 14, 2015
2 parents 011cb58 + 9585cb8 commit 0cb7054
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions Documentation/git-fast-import.txt
Expand Up @@ -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).
Expand Down

0 comments on commit 0cb7054

Please sign in to comment.