diff options
| author | Sverre Rabbelier <srabbelier@gmail.com> | 2009-12-04 18:06:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-04 16:10:59 -0800 |
| commit | 081751c882f8398081b94335faa23912a655fb1c (patch) | |
| tree | 3da0cea4682608beabbd36e0075a15e59d789bbc /Documentation/git-fast-import.txt | |
| parent | 2792f26c3e93c268732957b71c0390a1efe14d7e (diff) | |
| download | git-081751c882f8398081b94335faa23912a655fb1c.tar.gz | |
fast-import: allow for multiple --import-marks= arguments
The --import-marks= option may be specified multiple times on the
commandline and should result in all marks being read in. Only one
import-marks feature may be specified in the stream, which is
overriden by any --import-marks= commandline options.
If one wishes to specify import-marks files in addition to the one
specified in the stream, it is easy to repeat the stream option as a
--import-marks= commandline option.
Also verify this behavior with tests.
Signed-off-by: Sverre Rabbelier <srabbelier@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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 2d5f533f63..752f85c9ac 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -867,7 +867,8 @@ it does not. The <feature> part of the command may be any string matching ^[a-zA-Z][a-zA-Z-]*$ and should be understood by fast-import. -Feature work identical as their option counterparts. +Feature work identical as their option counterparts with the +exception of the import-marks feature, see below. The following features are currently supported: @@ -876,6 +877,11 @@ The following features are currently supported: * export-marks * force +The import-marks behaves differently from when it is specified as +commandline option in that only one "feature import-marks" is allowed +per stream. Also, any --import-marks= specified on the commandline +will override those from the stream (if any). + `option` ~~~~~~~~ Processes the specified option so that git fast-import behaves in a |