Merge branch 'mm/fast-import-feature-doc'

* mm/fast-import-feature-doc:
  Documentation/fast-import: clarify summary for `feature` command
This commit is contained in:
Junio C Hamano 2013-09-12 14:41:45 -07:00
commit 07fc8a9944

View File

@ -361,8 +361,8 @@ and control the current import process. More detailed discussion
`--cat-blob-fd` or `stdout` if unspecified.
`feature`::
Require that fast-import supports the specified feature, or
abort if it does not.
Enable the specified feature. This requires that fast-import
supports the specified feature, and aborts if it does not.
`option`::
Specify any of the options listed under OPTIONS that do not