| commit | 081751c882f8398081b94335faa23912a655fb1c | |
| author | Sverre Rabbelier <srabbelier@gmail.com> | |
| Fri, 4 Dec 2009 17:06:59 +0000 (4 18:06 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 5 Dec 2009 00:10:59 +0000 (4 16:10 -0800) | ||
| tree | 3da0cea4682608beabbd36e0075a15e59d789bbc | treesnapshot (tar.gz zip) |
| parent | 2792f26c3e93c268732957b71c0390a1efe14d7e | commitdiff |
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>
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>
| Documentation/git-fast-import.txt | diffblobblamehistory | |
| fast-import.c | diffblobblamehistory | |
| t/t9300-fast-import.sh | diffblobblamehistory |