kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2015-04-21 12:12:17 -07:00
parent 52735a6892 9585cb8d96
commit e9ab76da8f
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-fast-import.txt
View File

@ -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 the first ancestor of the current commit, and the branch will start
out with no files. An unlimited number of `merge` commands per out with no files. An unlimited number of `merge` commands per
commit are permitted by fast-import, thereby establishing an n-way merge. 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 Here `<commit-ish>` is any of the commit specification expressions
also accepted by `from` (see above). also accepted by `from` (see above).