Autogenerated HTML docs for v1.7.7-rc0

1 files changed, 10 insertions, 4 deletions

diff --git a/git-fast-import.html b/git-fast-import.html
index 98a96820e..0c6f35c7f 100644
--- a/git-fast-import.html
+++ b/git-fast-import.html
@@ -1568,12 +1568,18 @@ force
 <dt class="hdlist1">

 import-marks

 </dt>

+<dt class="hdlist1">

+import-marks-if-exists

+</dt>

 <dd>

 <p>

         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.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1950,7 +1956,7 @@ compression.</p></div>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-08-02 00:08:47 UTC

+Last updated 2011-08-26 16:16:25 UTC

 </div>

 </div>

 </body>