diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-04-14 14:45:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-14 14:45:21 -0700 |
| commit | e35ff42a5adbd14aa3edb2985668520e140ce6ac (patch) | |
| tree | be8d032a4581e64e485a526e5a8801f9c5f09d57 /git-fast-import.txt | |
| parent | 8ea9ba9e904e3716899f808461af29a6ea279a6a (diff) | |
| download | git-htmldocs-e35ff42a5adbd14aa3edb2985668520e140ce6ac.tar.gz | |
Autogenerated HTML docs for v2.4.0-rc2
Diffstat (limited to 'git-fast-import.txt')
| -rw-r--r-- | git-fast-import.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt index f71fb0134..690fed3ea 100644 --- a/git-fast-import.txt +++ b/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). |