Code

doc/fast-import: document feature import-marks-if-exists
authorDmitry Ivankov <divanorama@gmail.com>
Wed, 17 Aug 2011 10:42:58 +0000 (16:42 +0600)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Aug 2011 23:51:49 +0000 (16:51 -0700)
commit3beb4fc461e72f0b93ae233dcc1cece0046b8eb8
tree40ae0a41494d07eec9b068b2066c15a3a8a644a7
parentd28790dc31ca1bcdca7254a6b9381b6c84e91271
doc/fast-import: document feature import-marks-if-exists

fast-import command-line option --import-marks-if-exists was introduced
in commit dded4f1 (fast-import: Introduce --import-marks-if-exists, 2011-01-15)

--import-marks option can be set via a "feature" command in a fast-import
stream and --import-marks-if-exists had support for such specification
from the very beginning too due to some shared codebase. Though the
documentation for this feature wasn't written in dded4f1.

Add the documentation for "feature import-marks-if-exists=<file>". Also add
a minimalistic test for it.

Signed-off-by: Dmitry Ivankov <divanorama@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-fast-import.txt
t/t9300-fast-import.sh