fast-import: clarify documentation of "feature" command
commit68595cd442caabbd8b43ff0789d2829454efff1b
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 28 Nov 2010 19:43:57 +0000 (28 13:43 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Feb 2011 00:06:47 +0000 (9 16:06 -0800)
tree62cb939fba36ac16adae191b450d87d09cb1ee02
parentfc7642a096b99295a636ebde03e4b951a7da9c5a
fast-import: clarify documentation of "feature" command

The "feature" command allows streams to specify options for the import
that must not be ignored.  Logically, they are part of the stream,
even though technically most supported features are synonyms to
command-line options.

Make this more obvious by being more explicit about how the analogy
between most "feature" commands and command-line options works.  Treat
the feature (import-marks) that does not fit this analogy separately.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-fast-import.txt