diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2015-03-31 16:18:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-31 17:02:29 -0700 |
| commit | 9585cb8d964a1f17895d58b280b5adf62265be53 (patch) | |
| tree | 71c96c5bf953d36442a65910ba73fbe1159e8a90 | |
| parent | e156455ea49124c140a67623f22a393db62d5d98 (diff) | |
| download | git-jn/doc-fast-import-no-16-octopus-limit.tar.gz | |
fast-import doc: remove suggested 16-parent limitjn/doc-fast-import-no-16-octopus-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 <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 fd22a9a0c1..e41f80ab96 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -504,10 +504,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). |