diff options
author | Junio C Hamano <junio@kernel.org> | 2011-08-26 16:18:15 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2011-08-26 16:18:15 +0000 |
commit | d8fa0220d0e7f4c6a58a7132a4c500467ff43314 (patch) | |
tree | 2ca90517ed559e9c07e67d90c49e50deb5abd18f /git-fast-import.txt | |
parent | ac53020a437dd8086a64cf7d6c673e0a8f5a119c (diff) | |
download | git-htmldocs-d8fa0220d0e7f4c6a58a7132a4c500467ff43314.tar.gz |
Autogenerated HTML docs for v1.7.7-rc0
Diffstat (limited to 'git-fast-import.txt')
-rw-r--r-- | git-fast-import.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt index 296938888..db0d75fdb 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -1012,10 +1012,14 @@ force:: (see OPTIONS, above). import-marks:: +import-marks-if-exists:: Like --import-marks except in two respects: first, only one - "feature import-marks" command is allowed per stream; - second, an --import-marks= command-line option overrides - any "feature import-marks" command in the stream. + "feature import-marks" or "feature import-marks-if-exists" + command is allowed per stream; second, an --import-marks= + or --import-marks-if-exists command-line option overrides + any of these "feature" commands in the stream; third, + "feature import-marks-if-exists" like a corresponding + command-line option silently skips a nonexistent file. cat-blob:: ls:: |