diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-22 22:57:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-22 22:57:06 +0000 |
| commit | 074766f3e6232dcb7254da10f6c1cc3c9da1fb0c (patch) | |
| tree | 7a540b489116790971212415f0986824bdd7eda2 /git-merge-index.html | |
| parent | 83d46a2997fadfa1cbb85053f1c7315fa3591d67 (diff) | |
| download | git-htmldocs-074766f3e6232dcb7254da10f6c1cc3c9da1fb0c.tar.gz | |
Autogenerated HTML docs for v1.5.4.2-197-g22c43
Diffstat (limited to 'git-merge-index.html')
| -rw-r--r-- | git-merge-index.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-index.html b/git-merge-index.html index 95c3d3de1..f8ce82b02 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -272,7 +272,7 @@ git-merge-index(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-merge-index</em> [-o] [-q] <merge-program> (-a | -- | <file>*)</p>
+<p><em>git-merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -372,7 +372,7 @@ One-shot merge by Petr Baudis <pasky@ucw.cz></p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 07-Jan-2008 07:50:31 UTC
+Last updated 22-Feb-2008 22:56:35 UTC
</div>
</div>
</body>
|