diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2013-08-23 10:29:20 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-25 22:31:07 -0700 |
| commit | 87c9a140d212b2bf7f785136bb38a1a908bb391b (patch) | |
| tree | 10cb541c37c504dfcdfa17d703fa59d8a072793c /Documentation/git-fast-import.txt | |
| parent | f59bebb78edb26e4f66c2754bc4d168c5d4ebb4a (diff) | |
| download | git-87c9a140d212b2bf7f785136bb38a1a908bb391b.tar.gz | |
Documentation/fast-import: clarify summary for `feature` commandmm/fast-import-feature-doc
In most cases, "feature <foo>" 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 <Matthieu.Moy@imag.fr>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index bf1a02a80d..4a9cc74d57 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 |