summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-12 21:41:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-12 21:41:45 (GMT)
commit07fc8a994428c7288050a441a833e3bfcc4912a5 (patch)
tree1b76dfe3e04128f06fbfc8b65088e987b6b4c3a5
parent100ce1c543b8e9961ed59c047b902da1dd649666 (diff)
parent87c9a140d212b2bf7f785136bb38a1a908bb391b (diff)
downloadgit-07fc8a994428c7288050a441a833e3bfcc4912a5.zip
git-07fc8a994428c7288050a441a833e3bfcc4912a5.tar.gz
git-07fc8a994428c7288050a441a833e3bfcc4912a5.tar.bz2
Merge branch 'mm/fast-import-feature-doc'
* mm/fast-import-feature-doc: Documentation/fast-import: clarify summary for `feature` command
-rw-r--r--Documentation/git-fast-import.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index bf1a02a..4a9cc74 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -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