diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-11-28 13:43:57 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-02-09 16:06:47 -0800 |
| commit | 68595cd442caabbd8b43ff0789d2829454efff1b (patch) | |
| tree | 62cb939fba36ac16adae191b450d87d09cb1ee02 /Documentation/git-mergetool--lib.txt | |
| parent | Documentation/git-archive: spell --worktree-attributes correctly (diff) | |
| download | tgif-68595cd442caabbd8b43ff0789d2829454efff1b.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions