diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-15 23:33:35 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-15 23:33:35 +0000 |
| commit | 5f3d8396896b8e8fffa113072041cb34e9167e8b (patch) | |
| tree | 0d4d65f7767f700e03c07981e6163da5a23390c5 /git-merge-index.html | |
| parent | 92faa8075fbefc0ac3d77a3c8b6f5b5f89f6d457 (diff) | |
| download | git-htmldocs-5f3d8396896b8e8fffa113072041cb34e9167e8b.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-266-ga62ea
Diffstat (limited to 'git-merge-index.html')
| -rw-r--r-- | git-merge-index.html | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/git-merge-index.html b/git-merge-index.html index 1bf1f7a5e..16ac6952e 100644 --- a/git-merge-index.html +++ b/git-merge-index.html @@ -499,22 +499,13 @@ merge once anything has returned an error (i.e., <tt>cat</tt> returned an error for the AA file, because it didn’t exist in the original, and thus
<em>git merge-index</em> didn’t even try to merge the MM thing).</p></div>
</div>
-<h2 id="_author">Author</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Written by Linus Torvalds <<a href="mailto:torvalds@osdl.org">torvalds@osdl.org</a>>
-One-shot merge by Petr Baudis <<a href="mailto:pasky@ucw.cz">pasky@ucw.cz</a>></p></div>
-</div>
-<h2 id="_documentation">Documentation</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Documentation by David Greaves, Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
-</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-03 21:29:54 UTC
+Last updated 2011-03-15 23:30:14 UTC
</div>
</div>
</body>
|