aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-fast-import.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-09 16:41:16 -0800
committerJunio C Hamano <gitster@pobox.com>2011-02-09 16:41:16 -0800
commitfc180d98a20b6270ec25ca19c8d18a0a1286fe15 (patch)
treeb6adc1fc09968b5cd087d6c08ec197a0ea312438 /Documentation/git-fast-import.txt
parent5bb20ece6bdb31d395667855990dc540f2940a41 (diff)
parentdded4f12a46274753439e3a8fa4eb756c5d14ae1 (diff)
downloadgit-fc180d98a20b6270ec25ca19c8d18a0a1286fe15.tar.gz
git-fc180d98a20b6270ec25ca19c8d18a0a1286fe15.tar.xz
Merge branch 'rr/fi-import-marks-if-exists'
* rr/fi-import-marks-if-exists: fast-import: Introduce --import-marks-if-exists
Diffstat (limited to 'Documentation/git-fast-import.txt')
-rw-r--r--Documentation/git-fast-import.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 02bb49886..c3a2766b2 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -78,6 +78,10 @@ OPTIONS
set of marks. If a mark is defined to different values,
the last file wins.
+--import-marks-if-exists=<file>::
+ Like --import-marks but instead of erroring out, silently
+ skips the file if it does not exist.
+
--relative-marks::
After specifying --relative-marks= the paths specified
with --import-marks= and --export-marks= are relative