diff options
author | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 17:46:43 +0000 |
commit | 1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch) | |
tree | 72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-fmt-merge-msg.html | |
parent | a9701f0184382d8de7380c56558718915905746a (diff) | |
download | git-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz |
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-fmt-merge-msg.html')
-rw-r--r-- | git-fmt-merge-msg.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index f85096022..f667d18fb 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -328,7 +328,7 @@ git-fmt-merge-msg(1) Manual Page <div class="sectionbody">
<div class="para"><p>Takes the list of merged objects on stdin and produces a suitable
commit message to be used for the merge commit, usually to be
-passed as the <em><merge-message></em> argument of <em>git-merge</em>.</p></div>
+passed as the <em><merge-message></em> argument of <em>git merge</em>.</p></div>
<div class="para"><p>This command is intended mostly for internal use by scripts
automatically invoking <em>git merge</em>.</p></div>
</div>
@@ -421,7 +421,7 @@ merge.summary </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-12-03 09:12:35 UTC
+Last updated 2010-01-21 17:44:29 UTC
</div>
</div>
</body>
|