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-rerere.html | |
parent | 92faa8075fbefc0ac3d77a3c8b6f5b5f89f6d457 (diff) | |
download | git-htmldocs-5f3d8396896b8e8fffa113072041cb34e9167e8b.tar.gz |
Autogenerated HTML docs for v1.7.4.1-266-ga62ea
Diffstat (limited to 'git-rerere.html')
-rw-r--r-- | git-rerere.html | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/git-rerere.html b/git-rerere.html index c1119b2b8..756c507d5 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -621,17 +621,13 @@ would conflict the same way as the test merge you resolved earlier. <em>git rerere</em> will be run by <em>git rebase</em> to help you resolve this
conflict.</p></div>
</div>
-<h2 id="_author">Author</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</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-07-05 23:25:05 UTC
+Last updated 2011-03-15 23:30:14 UTC
</div>
</div>
</body>
|