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

* mm/fast-import-feature-doc: Documentation/fast-import: clarify summary for `feature` command
git-mirror · Sep 12, 2013 · 07fc8a9 · 07fc8a9
2 parents 100ce1c + 87c9a14
commit 07fc8a9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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