diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:32 -0700 |
| commit | 1d21112a946b338feaa4df4183ea26ac5d1353d0 (patch) | |
| tree | 5038b2bbaba3c88dcddd7a5e0460cbc9b873d136 /Documentation/git-fast-import.txt | |
| parent | 7abd8fb36d90cc68d471a04b59846d7816609116 (diff) | |
| parent | 3beb4fc461e72f0b93ae233dcc1cece0046b8eb8 (diff) | |
| download | git-1d21112a946b338feaa4df4183ea26ac5d1353d0.tar.gz | |
Merge branch 'di/fast-import-doc'
* di/fast-import-doc:
doc/fast-import: document feature import-marks-if-exists
Diffstat (limited to 'Documentation/git-fast-import.txt')
| -rw-r--r-- | Documentation/git-fast-import.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 2969388880..db0d75fdbc 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/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:: |