From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Apr 2015 19:12:17 +0000 (-0700)
Subject: Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint
X-Git-Tag: v2.3.6~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e9ab76da8f9ec1b4312de87bc68a1c4bcbf10329?hp=-c

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
---

e9ab76da8f9ec1b4312de87bc68a1c4bcbf10329
diff --combined Documentation/git-fast-import.txt
index f71fb0134b,e41f80ab96..690fed3ea4
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@@ -231,7 -231,7 +231,7 @@@ Date Format
  ~~~~~~~~~~~~
  The following date formats are supported.  A frontend should select
  the format it will use for this import by passing the format name
 -in the \--date-format=<fmt> command line option.
 +in the \--date-format=<fmt> command-line option.
  
  `raw`::
  	This is the Git native format and is `<time> SP <offutc>`.
@@@ -348,7 -348,7 +348,7 @@@ and control the current import process
  `done`::
  	Marks the end of the stream. This command is optional
  	unless the `done` feature was requested using the
 -	`--done` command line option or `feature done` command.
 +	`--done` command-line option or `feature done` command.
  
  `cat-blob`::
  	Causes fast-import to print a blob in 'cat-file --batch'
@@@ -437,7 -437,7 +437,7 @@@ the email address from the other field
  of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded.
  
  The time of the change is specified by `<when>` using the date format
 -that was selected by the \--date-format=<fmt> command line option.
 +that was selected by the \--date-format=<fmt> command-line option.
  See ``Date Formats'' above for the set of supported formats, and
  their syntax.
  
@@@ -483,9 -483,6 +483,9 @@@ Marks must be declared (via `mark`) bef
  * Any valid Git SHA-1 expression that resolves to a commit.  See
    ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details.
  
 +* The special null SHA-1 (40 zeros) specifies that the branch is to be
 +  removed.
 +
  The special case of restarting an incremental import from the
  current branch value should be written as:
  ----
@@@ -507,10 -504,6 +507,6 @@@ omitted when creating a new branch, th
  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).
@@@ -1088,7 -1081,7 +1084,7 @@@ Option commands must be the first comma
  feature commands), to give an option command after any non-option
  command is an error.
  
 -The following commandline options change import semantics and may therefore
 +The following command-line options change import semantics and may therefore
  not be passed as option:
  
  * date-format
@@@ -1102,7 -1095,7 +1098,7 @@@
  If the `done` feature is not in use, treated as if EOF was read.
  This can be used to tell fast-import to finish early.
  
 -If the `--done` command line option or `feature done` command is
 +If the `--done` command-line option or `feature done` command is
  in use, the `done` command is mandatory and marks the end of the
  stream.
  
@@@ -1441,10 -1434,6 +1437,10 @@@ operator can use this facility to peek 
  import in progress, at the cost of some added running time and worse
  compression.
  
 +SEE ALSO
 +--------
 +linkgit:git-fast-export[1]
 +
  GIT
  ---
  Part of the linkgit:git[1] suite