diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-04-14 11:49:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-14 11:49:08 -0700 |
| commit | 0cb7054e755f5d2bf9e7ba7471481cbd0957fb96 (patch) | |
| tree | cb7ef847729a5231f25e12cfed6b2a31ff8e5ee5 /Documentation/git-fast-import.txt | |
| parent | 011cb58bfba9b8784103c044ea1a6d578d2d3441 (diff) | |
| parent | 9585cb8d964a1f17895d58b280b5adf62265be53 (diff) | |
| download | git-0cb7054e755f5d2bf9e7ba7471481cbd0957fb96.tar.gz | |
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
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index f71fb0134b..690fed3ea4 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -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). |