From 87c9a140d212b2bf7f785136bb38a1a908bb391b Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Fri, 23 Aug 2013 10:29:20 +0200 Subject: Documentation/fast-import: clarify summary for `feature` command In most cases, "feature " does not just require that the feature exists, but also changes the behavior by enabling it. Cases where the feature is only requested like cat-blob, notes or ls are clearly documented below. Signed-off-by: Matthieu Moy Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano 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 -- cgit v0.10.2-6-g49f6