diff options
| author | Junio C Hamano <junio@kernel.org> | 2009-12-03 09:15:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2009-12-03 09:15:44 +0000 |
| commit | fa2ad88002013b3cb6a6ea1292911b1fde7f42f3 (patch) | |
| tree | 692368d420f6e72a067f09e2dbcb10baca68632e /git-merge.html | |
| parent | 281025ef913d8bcfd5f668ef9d16e82996afc364 (diff) | |
| download | git-htmldocs-fa2ad88002013b3cb6a6ea1292911b1fde7f42f3.tar.gz | |
Autogenerated HTML docs for v1.6.6-rc1-5-ge21a85
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/git-merge.html b/git-merge.html index 41711eba2..55690bbdb 100644 --- a/git-merge.html +++ b/git-merge.html @@ -940,3 +940,23 @@ release/version name would be acceptable.</p></div> <a href="git-diff.html">git-diff(1)</a>, <a href="git-ls-files.html">git-ls-files(1)</a>,
<a href="git-add.html">git-add(1)</a>, <a href="git-rm.html">git-rm(1)</a>,
<a href="git-mergetool.html">git-mergetool(1)</a></p></div>
+</div>
+<h2 id="_author">Author</h2>
+<div class="sectionbody">
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>
+</div>
+<h2 id="_documentation">Documentation</h2>
+<div class="sectionbody">
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
+</div>
+<h2 id="_git">GIT</h2>
+<div class="sectionbody">
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+</div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2009-12-03 09:12:41 UTC
+</div>
+</div>
+</body>
+</html>
|