summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorLibravatar Sverre Rabbelier <srabbelier@gmail.com>2009-12-04 18:06:59 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-12-04 16:10:59 -0800
commit081751c882f8398081b94335faa23912a655fb1c (patch)
tree3da0cea4682608beabbd36e0075a15e59d789bbc /Documentation/Makefile
parentfast-import: test the new option command (diff)
downloadtgif-081751c882f8398081b94335faa23912a655fb1c.tar.xz
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/Makefile')
0 files changed, 0 insertions, 0 deletions