diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-06-08 22:49:47 +0000 |
commit | eb415999b469f6d3e718f2fdf28dd460d8db5f4f (patch) | |
tree | ca4b12fcea8cc51c42b66ee456255ee4ea85b203 /git-fmt-merge-msg.html | |
parent | e2b205c118b67a65b1bde35ff88de1f7aceae8d0 (diff) | |
download | git-htmldocs-eb415999b469f6d3e718f2fdf28dd460d8db5f4f.tar.gz |
Autogenerated HTML docs for v1.5.6-rc2-15-g457bb
Diffstat (limited to 'git-fmt-merge-msg.html')
-rw-r--r-- | git-fmt-merge-msg.html | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 105a3c7c3..962bc761f 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -307,7 +307,10 @@ automatically invoking <tt>git-merge</tt>.</p> </p>
</dd>
<dt>
---summary,--no-summary
+--summary
+</dt>
+<dt>
+--no-summary
</dt>
<dd>
<p>
@@ -316,7 +319,10 @@ automatically invoking <tt>git-merge</tt>.</p> </p>
</dd>
<dt>
---file <file>, -F <file>
+-F <file>
+</dt>
+<dt>
+--file <file>
</dt>
<dd>
<p>
@@ -367,7 +373,7 @@ merge.summary </div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 01:33:41 UTC
+Last updated 08-Jun-2008 22:46:38 UTC
</div>
</div>
</body>
|