+
or like this (when '--cc' option is used):
- diff --c file
+ diff --cc file
2. It is followed by one or more extended header lines
(this example shows a merge with two parents):
</p>\r
</li>\r
</ol></div>\r
-<div class="para"><p>The command refuses to process new mailboxes while <tt>.git/rebase</tt>\r
+<div class="para"><p>The command refuses to process new mailboxes while <tt>.git/rebase-apply</tt>\r
directory exists, so if you decide to start over from scratch,\r
-run <tt>rm -f -r .git/rebase</tt> before running the command with mailbox\r
+run <tt>rm -f -r .git/rebase-apply</tt> before running the command with mailbox\r
names.</p></div>\r
<div class="para"><p>Before any patches are applied, ORIG_HEAD is set to the tip of the\r
current branch. This is useful if you have problems with multiple\r
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-21 04:33:30 UTC\r
+Last updated 2008-07-22 09:19:03 UTC\r
</div>\r
</div>\r
</body>\r
the index file to bring it in a state that the patch should
have produced. Then run the command with '--resolved' option.
-The command refuses to process new mailboxes while `.git/rebase`
+The command refuses to process new mailboxes while `.git/rebase-apply`
directory exists, so if you decide to start over from scratch,
-run `rm -f -r .git/rebase` before running the command with mailbox
+run `rm -f -r .git/rebase-apply` before running the command with mailbox
names.
Before any patches are applied, ORIG_HEAD is set to the tip of the
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
</div>\r
<h2 id="_author">AUTHOR</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:35 UTC\r
+Last updated 2008-07-22 09:19:03 UTC\r
</div>\r
</div>\r
</body>\r
AUTHOR
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
GIT
---
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-15 15:48:34 UTC\r
+Last updated 2008-07-22 09:19:04 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
+Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <gitster@pobox.com>
Documentation
--------------
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-check-attr(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git check-attr</em> attr… [--] pathname…</p>\r
+<div class="para"><p><em>git check-attr</em> attr… [--] pathname…</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>For every pathname, this command will list if each attr is <em>unspecified</em>,\r
-<em>set</em>, or <em>unset</em> as a gitattribute on that pathname.</p>\r
+<div class="para"><p>For every pathname, this command will list if each attr is <em>unspecified</em>,\r
+<em>set</em>, or <em>unset</em> as a gitattribute on that pathname.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
--\r
</dt>\r
be treated as an attribute.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>SEE ALSO</h2>\r
+<h2 id="_see_also">SEE ALSO</h2>\r
<div class="sectionbody">\r
-<p><a href="gitattributes.html">gitattributes(5)</a>.</p>\r
+<div class="para"><p><a href="gitattributes.html">gitattributes(5)</a>.</p></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Junio C Hamano <junkio@cox.net></p>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by James Bowes.</p>\r
+<div class="para"><p>Documentation by James Bowes.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:34 UTC\r
+Last updated 2008-07-22 09:19:04 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-17 08:08:28 UTC\r
+Last updated 2008-07-22 09:19:05 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:38 UTC\r
+Last updated 2008-07-22 09:19:05 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and\r
-Junio C Hamano <junkio@cox.net></p></div>\r
+Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:39 UTC\r
+Last updated 2008-07-22 09:19:05 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>
GIT
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-count-objects(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git count-objects</em> [-v]</p>\r
+<div class="para"><p><em>git count-objects</em> [-v]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>This counts the number of unpacked object files and disk space consumed by\r
-them, to help you decide when it is a good time to repack.</p>\r
+<div class="para"><p>This counts the number of unpacked object files and disk space consumed by\r
+them, to help you decide when it is a good time to repack.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
-v\r
</dt>\r
removed by running <tt>git prune-packed</tt>.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Junio C Hamano <junkio@cox.net></p>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:37 UTC\r
+Last updated 2008-07-22 09:19:05 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>, but somewhat\r
-butchered by Junio C Hamano <junkio@cox.net>. Later significantly\r
+butchered by Junio C Hamano <gitster@pobox.com>. Later significantly\r
updated by Shawn Pearce <spearce@spearce.org>.</p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:42 UTC\r
+Last updated 2008-07-22 09:19:05 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org>, but somewhat
-butchered by Junio C Hamano <junkio@cox.net>. Later significantly
+butchered by Junio C Hamano <gitster@pobox.com>. Later significantly
updated by Shawn Pearce <spearce@spearce.org>.
Documentation
<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div>\r
<div class="literalblock">\r
<div class="content">\r
-<pre><tt>diff --c file</tt></pre>\r
+<pre><tt>diff --cc file</tt></pre>\r
</div></div>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:43 UTC\r
+Last updated 2008-07-22 09:19:06 UTC\r
</div>\r
</div>\r
</body>\r
<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div>\r
<div class="literalblock">\r
<div class="content">\r
-<pre><tt>diff --c file</tt></pre>\r
+<pre><tt>diff --cc file</tt></pre>\r
</div></div>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:43 UTC\r
+Last updated 2008-07-22 09:19:06 UTC\r
</div>\r
</div>\r
</body>\r
<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div>\r
<div class="literalblock">\r
<div class="content">\r
-<pre><tt>diff --c file</tt></pre>\r
+<pre><tt>diff --cc file</tt></pre>\r
</div></div>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-16 03:23:18 UTC\r
+Last updated 2008-07-22 09:19:07 UTC\r
</div>\r
</div>\r
</body>\r
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-diff(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git diff</em> [<common diff options>] <commit>{0,2} [--] [<path>…]</p>\r
+<div class="para"><p><em>git diff</em> [<common diff options>] <commit>{0,2} [--] [<path>…]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Show changes between two trees, a tree and the working tree, a\r
-tree and the index file, or the index file and the working tree.</p>\r
-<dl>\r
+<div class="para"><p>Show changes between two trees, a tree and the working tree, a\r
+tree and the index file, or the index file and the working tree.</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
<em>git diff</em> [--options] [--] [<path>…]\r
</dt>\r
<p>\r
This form is to view the changes you made relative to\r
the index (staging area for the next commit). In other\r
- words, the differences are what you _could_ tell git to\r
+ words, the differences are what you <em>could</em> tell git to\r
further add to the index but you still haven't. You can\r
stage these changes by using <a href="git-add.html">git-add(1)</a>.\r
</p>\r
-<p>If exactly two paths are given, and at least one is untracked,\r
+<div class="para"><p>If exactly two paths are given, and at least one is untracked,\r
compare the two files / directories. This behavior can be\r
-forced by --no-index.</p>\r
+forced by --no-index.</p></div>\r
</dd>\r
<dt>\r
<em>git diff</em> [--options] --cached [<commit>] [--] [<path>…]\r
of <commit>, which has the same effect as using HEAD instead.\r
</p>\r
</dd>\r
-</dl>\r
-<p>Just in case if you are doing something exotic, it should be\r
+</dl></div>\r
+<div class="para"><p>Just in case if you are doing something exotic, it should be\r
noted that all of the <commit> in the above description, except\r
for the last two forms that use ".." notations, can be any\r
-<tree-ish>.</p>\r
-<p>For a more complete list of ways to spell <commit>, see\r
+<tree-ish>.</p></div>\r
+<div class="para"><p>For a more complete list of ways to spell <commit>, see\r
"SPECIFYING REVISIONS" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.\r
-However, "diff" is about comparing two _endpoints_, not ranges,\r
+However, "diff" is about comparing two <em>endpoints</em>, not ranges,\r
and the range notations ("<commit>..<commit>" and\r
"<commit>...<commit>") do not mean a range as defined in the\r
-"SPECIFYING RANGES" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p>\r
+"SPECIFYING RANGES" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
-p\r
</dt>\r
Do not show any source or destination prefix.\r
</p>\r
</dd>\r
-</dl>\r
-<p>For more detailed explanation on these common options, see also\r
-<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p>\r
-<dl>\r
+</dl></div>\r
+<div class="para"><p>For more detailed explanation on these common options, see also\r
+<a href="gitdiffcore.html">gitdiffcore(7)</a>.</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
<path>…\r
</dt>\r
names and get diff for all files under them).\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Output format</h2>\r
+<h2 id="_output_format">Output format</h2>\r
<div class="sectionbody">\r
-<p>The output format from "git-diff-index", "git-diff-tree",\r
-"git-diff-files" and "git diff --raw" are very similar.</p>\r
-<p>These commands all compare two sets of things; what is\r
-compared differs:</p>\r
-<dl>\r
+<div class="para"><p>The output format from "git-diff-index", "git-diff-tree",\r
+"git-diff-files" and "git diff --raw" are very similar.</p></div>\r
+<div class="para"><p>These commands all compare two sets of things; what is\r
+compared differs:</p></div>\r
+<div class="vlist"><dl>\r
<dt>\r
git-diff-index <tree-ish>\r
</dt>\r
compares the index and the files on the filesystem.\r
</p>\r
</dd>\r
-</dl>\r
-<p>An output line is formatted this way:</p>\r
+</dl></div>\r
+<div class="para"><p>An output line is formatted this way:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>in-place edit :100644 100644 bcd1234... 0123456... M file0\r
delete :100644 000000 1234567... 0000000... D file5\r
unmerged :000000 000000 0000000... 0000000... U file6</tt></pre>\r
</div></div>\r
-<p>That is, from the left to the right:</p>\r
-<ol>\r
+<div class="para"><p>That is, from the left to the right:</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
a colon.\r
an LF or a NUL when <em>-z</em> option is used, to terminate the record.\r
</p>\r
</li>\r
-</ol>\r
-<p><sha1> is shown as all 0's if a file is new on the filesystem\r
-and it is out of sync with the index.</p>\r
-<p>Example:</p>\r
+</ol></div>\r
+<div class="para"><p><sha1> is shown as all 0's if a file is new on the filesystem\r
+and it is out of sync with the index.</p></div>\r
+<div class="para"><p>Example:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>:100644 100644 5be4a4...... 000000...... M file.c</tt></pre>\r
</div></div>\r
-<p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters\r
+<div class="para"><p>When <tt>-z</tt> option is not used, TAB, LF, and backslash characters\r
in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>,\r
-respectively.</p>\r
+respectively.</p></div>\r
</div>\r
-<h2>diff format for merges</h2>\r
+<h2 id="_diff_format_for_merges">diff format for merges</h2>\r
<div class="sectionbody">\r
-<p>"git-diff-tree", "git-diff-files" and "git-diff --raw"\r
+<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw"\r
can take <em>-c</em> or <em>--cc</em> option\r
to generate diff output also for merge commits. The output differs\r
-from the format described above in the following way:</p>\r
-<ol>\r
+from the format described above in the following way:</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
there is a colon for each parent\r
single path, only for "dst"\r
</p>\r
</li>\r
-</ol>\r
-<p>Example:</p>\r
+</ol></div>\r
+<div class="para"><p>Example:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c</tt></pre>\r
</div></div>\r
-<p>Note that <em>combined diff</em> lists only files which were modified from\r
-all parents.</p>\r
+<div class="para"><p>Note that <em>combined diff</em> lists only files which were modified from\r
+all parents.</p></div>\r
</div>\r
-<h2>Generating patches with -p</h2>\r
+<h2 id="_generating_patches_with_p">Generating patches with -p</h2>\r
<div class="sectionbody">\r
-<p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run\r
+<div class="para"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run\r
with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or\r
"git log" with the "-p" option, they\r
do not produce the output described above; instead they produce a\r
patch file. You can customize the creation of such patches via the\r
-GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p>\r
-<p>What the -p option produces is slightly different from the traditional\r
-diff format.</p>\r
-<ol>\r
+GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p></div>\r
+<div class="para"><p>What the -p option produces is slightly different from the traditional\r
+diff format.</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
It is preceded with a "git diff" header, that looks like\r
<div class="content">\r
<pre><tt>diff --git a/file1 b/file2</tt></pre>\r
</div></div>\r
-<p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is\r
+<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is\r
involved. Especially, even for a creation or a deletion,\r
-<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p>\r
-<p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the\r
+<tt>/dev/null</tt> is <em>not</em> used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>\r
+<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the\r
name of the source file of the rename/copy and the name of\r
-the file that rename/copy produces, respectively.</p>\r
+the file that rename/copy produces, respectively.</p></div>\r
</li>\r
<li>\r
<p>\r
pathname is put in double quotes.\r
</p>\r
</li>\r
-</ol>\r
-<p>The similarity index is the percentage of unchanged lines, and\r
+</ol></div>\r
+<div class="para"><p>The similarity index is the percentage of unchanged lines, and\r
the dissimilarity index is the percentage of changed lines. It\r
is a rounded down integer, followed by a percent sign. The\r
similarity index value of 100% is thus reserved for two equal\r
files, while 100% dissimilarity means that no line from the old\r
-file made it into the new one.</p>\r
+file made it into the new one.</p></div>\r
</div>\r
-<h2>combined diff format</h2>\r
+<h2 id="_combined_diff_format">combined diff format</h2>\r
<div class="sectionbody">\r
-<p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or\r
+<div class="para"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or\r
<em>--cc</em> option to produce <em>combined diff</em>. For showing a merge commit\r
with "git log -p", this is the default format.\r
-A <em>combined diff</em> format looks like this:</p>\r
+A <em>combined diff</em> format looks like this:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>diff --combined describe.c\r
initialized = 1;\r
for_each_ref(get_name);</tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
It is preceded with a "git diff" header, that looks like\r
<div class="content">\r
<pre><tt>diff --combined file</tt></pre>\r
</div></div>\r
-<p>or like this (when <em>--cc</em> option is used):</p>\r
+<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div>\r
<div class="literalblock">\r
<div class="content">\r
-<pre><tt>diff --c file</tt></pre>\r
+<pre><tt>diff --cc file</tt></pre>\r
</div></div>\r
</li>\r
<li>\r
new file mode <mode>\r
deleted file mode <mode>,<mode></tt></pre>\r
</div></div>\r
-<p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of\r
+<div class="para"><p>The <tt>mode <mode>,<mode>..<mode></tt> line appears only if at least one of\r
the <mode> is different from the rest. Extended headers with\r
information about detected contents movement (renames and\r
copying detection) are designed to work with diff of two\r
-<tree-ish> and are not used by combined diff format.</p>\r
+<tree-ish> and are not used by combined diff format.</p></div>\r
</li>\r
<li>\r
<p>\r
<pre><tt>--- a/file\r
+++ b/file</tt></pre>\r
</div></div>\r
-<p>Similar to two-line header for traditional <em>unified</em> diff\r
+<div class="para"><p>Similar to two-line header for traditional <em>unified</em> diff\r
format, <tt>/dev/null</tt> is used to signal created or deleted\r
-files.</p>\r
+files.</p></div>\r
</li>\r
<li>\r
<p>\r
<div class="content">\r
<pre><tt>@@@ <from-file-range> <from-file-range> <to-file-range> @@@</tt></pre>\r
</div></div>\r
-<p>There are (number of parents + 1) <tt>@</tt> characters in the chunk\r
-header for combined diff format.</p>\r
+<div class="para"><p>There are (number of parents + 1) <tt>@</tt> characters in the chunk\r
+header for combined diff format.</p></div>\r
</li>\r
-</ol>\r
-<p>Unlike the traditional <em>unified</em> diff format, which shows two\r
+</ol></div>\r
+<div class="para"><p>Unlike the traditional <em>unified</em> diff format, which shows two\r
files A and B with a single column that has <tt>-</tt> (minus —\r
appears in A but removed in B), <tt>+</tt> (plus — missing in A but\r
added to B), or <tt>" "</tt> (space — unchanged) prefix, this format\r
compares two or more files file1, file2,… with one file X, and\r
shows how X differs from each of fileN. One column for each of\r
fileN is prepended to the output line to note how X's line is\r
-different from it.</p>\r
-<p>A <tt>-</tt> character in the column N means that the line appears in\r
+different from it.</p></div>\r
+<div class="para"><p>A <tt>-</tt> character in the column N means that the line appears in\r
fileN but it does not appear in the result. A <tt>+</tt> character\r
in the column N means that the line appears in the last file,\r
and fileN does not have that line (in other words, the line was\r
-added, from the point of view of that parent).</p>\r
-<p>In the above example output, the function signature was changed\r
+added, from the point of view of that parent).</p></div>\r
+<div class="para"><p>In the above example output, the function signature was changed\r
from both files (hence two <tt>-</tt> removals from both file1 and\r
-file2, plus <tt>++</tt> to mean one line that was added does not appear\r
+file2, plus <tt><tt>+</tt> to mean one line that was added does not appear\r
in either file1 nor file2). Also two other lines are the same\r
-from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>\r
-<p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a\r
+from file1 but do not appear in file2 (hence prefixed with <tt> </tt></tt>).</p></div>\r
+<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a\r
merge commit with the merge result (i.e. file1..fileN are the\r
parents). When shown by <tt>git diff-files -c</tt>, it compares the\r
two unresolved merge parents with the working tree file\r
(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka\r
-"their version").</p>\r
+"their version").</p></div>\r
</div>\r
-<h2>other diff formats</h2>\r
+<h2 id="_other_diff_formats">other diff formats</h2>\r
<div class="sectionbody">\r
-<p>The <tt>--summary</tt> option describes newly added, deleted, renamed and\r
+<div class="para"><p>The <tt>--summary</tt> option describes newly added, deleted, renamed and\r
copied files. The <tt>--stat</tt> option adds diffstat(1) graph to the\r
output. These options can be combined with other options, such as\r
-<tt>-p</tt>, and are meant for human consumption.</p>\r
-<p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output\r
+<tt>-p</tt>, and are meant for human consumption.</p></div>\r
+<div class="para"><p>When showing a change that involves a rename or a copy, <tt>--stat</tt> output\r
formats the pathnames compactly by combining common prefix and suffix of\r
the pathnames. For example, a change that moves <tt>arch/i386/Makefile</tt> to\r
-<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p>\r
+<tt>arch/x86/Makefile</tt> while modifying 4 lines will be shown like this:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>arch/{i386 => x86}/Makefile | 4 +--</tt></pre>\r
</div></div>\r
-<p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed\r
+<div class="para"><p>The <tt>--numstat</tt> option gives the diffstat(1) information but is designed\r
for easier machine consumption. An entry in <tt>--numstat</tt> output looks\r
-like this:</p>\r
+like this:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>1 2 README\r
3 1 arch/{i386 => x86}/Makefile</tt></pre>\r
</div></div>\r
-<p>That is, from left to right:</p>\r
-<ol>\r
+<div class="para"><p>That is, from left to right:</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
the number of added lines;\r
a newline.\r
</p>\r
</li>\r
-</ol>\r
-<p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p>\r
+</ol></div>\r
+<div class="para"><p>When <tt>-z</tt> output option is in effect, the output is formatted this way:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>1 2 README NUL\r
3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL</tt></pre>\r
</div></div>\r
-<p>That is:</p>\r
-<ol>\r
+<div class="para"><p>That is:</p></div>\r
+<div class="olist"><ol>\r
<li>\r
<p>\r
the number of added lines;\r
a NUL.\r
</p>\r
</li>\r
-</ol>\r
-<p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow\r
+</ol></div>\r
+<div class="para"><p>The extra <tt>NUL</tt> before the preimage path in renamed case is to allow\r
scripts that read the output to tell if the current record being read is\r
a single-path record or a rename/copy record without reading ahead.\r
After reading added and deleted lines, reading up to <tt>NUL</tt> would yield\r
-the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>\r
+the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p></div>\r
</div>\r
-<h2>EXAMPLES</h2>\r
+<h2 id="_examples">EXAMPLES</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
Various ways to check your working tree\r
</dt>\r
$ git diff --cached <b>(2)</b>\r
$ git diff HEAD <b>(3)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
Changes in the working tree not yet staged for the next commit.\r
would be committing if you run "git commit -a"\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
<dt>\r
Comparing with arbitrary commits\r
$ git diff HEAD -- ./test <b>(2)</b>\r
$ git diff HEAD^ HEAD <b>(3)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
Instead of using the tip of the current branch, compare with the\r
Compare the version before the last commit and the last commit.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
<dt>\r
Comparing branches\r
$ git diff topic..master <b>(2)</b>\r
$ git diff topic...master <b>(3)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
Changes between the tips of the topic and the master branches.\r
branch was started off it.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
<dt>\r
Limiting the diff output\r
$ git diff --name-status <b>(2)</b>\r
$ git diff arch/i386 include/asm-i386 <b>(3)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
Show only modification, rename and copy, but not addition\r
Limit diff output to named subtrees.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
<dt>\r
Munging the diff output\r
<pre><tt>$ git diff --find-copies-harder -B -C <b>(1)</b>\r
$ git diff -R <b>(2)</b></tt></pre>\r
</div></div>\r
-<ol>\r
+<div class="colist"><ol>\r
<li>\r
<p>\r
Spend extra cycles to find renames, copies and complete\r
Output diff in reverse.\r
</p>\r
</li>\r
-</ol>\r
+</ol></div>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:41 UTC\r
+Last updated 2008-07-22 09:19:07 UTC\r
</div>\r
</div>\r
</body>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and\r
-Junio C Hamano <junkio@cox.net></p></div>\r
+Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:46 UTC\r
+Last updated 2008-07-22 09:19:09 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>
Documentation
-------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:47 UTC\r
+Last updated 2008-07-22 09:19:09 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:48 UTC\r
+Last updated 2008-07-22 09:19:09 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:50 UTC\r
+Last updated 2008-07-22 09:19:10 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
<div class="para"><p>or like this (when <em>--cc</em> option is used):</p></div>\r
<div class="literalblock">\r
<div class="content">\r
-<pre><tt>diff --c file</tt></pre>\r
+<pre><tt>diff --cc file</tt></pre>\r
</div></div>\r
</li>\r
<li>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-16 03:23:19 UTC\r
+Last updated 2008-07-22 09:19:10 UTC\r
</div>\r
</div>\r
</body>\r
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:52 UTC\r
+Last updated 2008-07-22 09:19:11 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
GIT
---
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-ls-tree(1)</title>\r
</head>\r
[--name-only] [--name-status] [--full-name] [--abbrev=[<n>]]\r
<tree-ish> [paths…]</div></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Lists the contents of a given tree object, like what "/bin/ls -a" does\r
+<div class="para"><p>Lists the contents of a given tree object, like what "/bin/ls -a" does\r
in the current working directory. Note that the usage is subtly different,\r
though - <em>paths</em> denote just a list of patterns to match, e.g. so specifying\r
directory name (without <em>-r</em>) will behave differently, and order of the\r
-arguments does not matter.</p>\r
+arguments does not matter.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<tree-ish>\r
</dt>\r
implicitly uses the root level of the tree as the sole path argument.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Output Format</h2>\r
+<h2 id="_output_format">Output Format</h2>\r
<div class="sectionbody">\r
<div class="literalblock">\r
<div class="content">\r
<pre><tt><mode> SP <type> SP <object> TAB <file></tt></pre>\r
</div></div>\r
-<p>When the <tt>-z</tt> option is not used, TAB, LF, and backslash characters\r
-in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.</p>\r
-<p>When the <tt>-l</tt> option is used, format changes to</p>\r
+<div class="para"><p>When the <tt>-z</tt> option is not used, TAB, LF, and backslash characters\r
+in pathnames are represented as <tt>\t</tt>, <tt>\n</tt>, and <tt>\\</tt>, respectively.</p></div>\r
+<div class="para"><p>When the <tt>-l</tt> option is used, format changes to</p></div>\r
<div class="literalblock">\r
<div class="content">\r
<pre><tt><mode> SP <type> SP <object> SP <object size> TAB <file></tt></pre>\r
</div></div>\r
-<p>Object size identified by <object> is given in bytes, and right-justified\r
+<div class="para"><p>Object size identified by <object> is given in bytes, and right-justified\r
with minimum width of 7 characters. Object size is given only for blobs\r
-(file) entries; for other entries <tt>-</tt> character is used in place of size.</p>\r
+(file) entries; for other entries <tt>-</tt> character is used in place of size.</p></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Petr Baudis <pasky@suse.cz>\r
-Completely rewritten from scratch by Junio C Hamano <junkio@cox.net>,\r
-another major rewrite by Linus Torvalds <torvalds@osdl.org></p>\r
+<div class="para"><p>Written by Petr Baudis <pasky@suse.cz>\r
+Completely rewritten from scratch by Junio C Hamano <gitster@pobox.com>,\r
+another major rewrite by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list\r
-<git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list\r
+<git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:51 UTC\r
+Last updated 2008-07-22 09:19:11 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Petr Baudis <pasky@suse.cz>
-Completely rewritten from scratch by Junio C Hamano <junkio@cox.net>,
+Completely rewritten from scratch by Junio C Hamano <gitster@pobox.com>,
another major rewrite by Linus Torvalds <torvalds@osdl.org>
Documentation
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and\r
-Junio C Hamano <junkio@cox.net></p></div>\r
+Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-14 03:12:29 UTC\r
+Last updated 2008-07-22 09:19:11 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>
Documentation
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-mailsplit(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git mailsplit</em> [-b] [-f<nn>] [-d<prec>] -o<directory> [--] [<mbox>|<Maildir>…]</p>\r
+<div class="para"><p><em>git mailsplit</em> [-b] [-f<nn>] [-d<prec>] -o<directory> [--] [<mbox>|<Maildir>…]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Splits a mbox file or a Maildir into a list of files: "0001" "0002" .. in the\r
-specified directory so you can process them further from there.</p>\r
+<div class="para"><p>Splits a mbox file or a Maildir into a list of files: "0001" "0002" .. in the\r
+specified directory so you can process them further from there.</p></div>\r
<div class="admonitionblock">\r
<table><tr>\r
<td class="icon">\r
</tr></table>\r
</div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<mbox>\r
</dt>\r
start the numbering with 0004.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org>\r
-and Junio C Hamano <junkio@cox.net></p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>\r
+and Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:52 UTC\r
+Last updated 2008-07-22 09:19:12 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
-and Junio C Hamano <junkio@cox.net>
+and Junio C Hamano <gitster@pobox.com>
Documentation
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>,\r
-Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.</p></div>\r
+Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.</p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:54 UTC\r
+Last updated 2008-07-22 09:19:12 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org>,
-Junio C Hamano <
junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
+Junio C Hamano <
gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-20 01:23:33 UTC\r
+Last updated 2008-07-22 09:19:12 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-mktree(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git mktree</em> [-z]</p>\r
+<div class="para"><p><em>git mktree</em> [-z]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Reads standard input in non-recursive <tt>ls-tree</tt> output format,\r
+<div class="para"><p>Reads standard input in non-recursive <tt>ls-tree</tt> output format,\r
and creates a tree object. The object name of the tree object\r
-built is written to the standard output.</p>\r
+built is written to the standard output.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
-z\r
</dt>\r
Read the NUL-terminated <tt>ls-tree -z</tt> output instead.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Junio C Hamano <junkio@cox.net></p>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:54 UTC\r
+Last updated 2008-07-22 09:19:13 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:56 UTC\r
+Last updated 2008-07-22 09:19:13 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>\r
-and Junio C Hamano <junkio@cox.net></p></div>\r
+and Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:56 UTC\r
+Last updated 2008-07-22 09:19:13 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
-and Junio C Hamano <junkio@cox.net>
+and Junio C Hamano <gitster@pobox.com>
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net>, later rewritten in C\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com>, later rewritten in C\r
by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:57 UTC\r
+Last updated 2008-07-22 09:19:13 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>, later rewritten in C
+Written by Junio C Hamano <gitster@pobox.com>, later rewritten in C
by Linus Torvalds <torvalds@osdl.org>
Documentation
completely automatic. You will have to resolve any such merge failure\r
and run <tt>git rebase --continue</tt>. Another option is to bypass the commit\r
that caused the merge failure with <tt>git rebase --skip</tt>. To restore the\r
-original <branch> and remove the .git/rebase working files, use the command\r
-<tt>git rebase --abort</tt> instead.</p></div>\r
+original <branch> and remove the .git/rebase-apply working files, use the\r
+command <tt>git rebase --abort</tt> instead.</p></div>\r
<div class="para"><p>Assume the following history exists and the current branch is "topic":</p></div>\r
<div class="listingblock">\r
<div class="content">\r
</div>\r
<h2 id="_authors">Authors</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net> and\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com> and\r
Johannes E. Schindelin <johannes.schindelin@gmx.de></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-16 03:23:20 UTC\r
+Last updated 2008-07-22 09:19:14 UTC\r
</div>\r
</div>\r
</body>\r
completely automatic. You will have to resolve any such merge failure
and run `git rebase --continue`. Another option is to bypass the commit
that caused the merge failure with `git rebase --skip`. To restore the
-original <branch> and remove the .git/rebase working files, use the command
-`git rebase --abort` instead.
+original <branch> and remove the .git/rebase-apply working files, use the
+command `git rebase --abort` instead.
Assume the following history exists and the current branch is "topic":
Authors
------
-Written by Junio C Hamano <junkio@cox.net> and
+Written by Junio C Hamano <gitster@pobox.com> and
Johannes E. Schindelin <johannes.schindelin@gmx.de>
Documentation
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:58 UTC\r
+Last updated 2008-07-22 09:19:14 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-request-pull(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git request-pull</em> <start> <url> [<end>]</p>\r
+<div class="para"><p><em>git request-pull</em> <start> <url> [<end>]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Summarizes the changes between two commits to the standard output, and includes\r
-the given URL in the generated summary.</p>\r
+<div class="para"><p>Summarizes the changes between two commits to the standard output, and includes\r
+the given URL in the generated summary.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<start>\r
</dt>\r
Commit to end at; defaults to HEAD.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Ryan Anderson <ryan@michonline.com> and Junio C Hamano <junkio@cox.net></p>\r
+<div class="para"><p>Written by Ryan Anderson <ryan@michonline.com> and Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:59 UTC\r
+Last updated 2008-07-22 09:19:15 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Ryan Anderson <ryan@michonline.com> and Junio C Hamano <junkio@cox.net>
+Written by Ryan Anderson <ryan@michonline.com> and Junio C Hamano <gitster@pobox.com>
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:59 UTC\r
+Last updated 2008-07-22 09:19:15 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
GIT
---
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net> and Linus Torvalds <torvalds@osdl.org></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:59 UTC\r
+Last updated 2008-07-22 09:19:15 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net> and Linus Torvalds <torvalds@osdl.org>
+Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> .\r
-Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.org></p></div>\r
+Junio C Hamano <gitster@pobox.com> and Pierre Habouzit <madcoder@debian.org></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-09 19:53:03 UTC\r
+Last updated 2008-07-22 09:19:16 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org> .
-Junio C Hamano <junkio@cox.net> and Pierre Habouzit <madcoder@debian.org>
+Junio C Hamano <gitster@pobox.com> and Pierre Habouzit <madcoder@debian.org>
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-17 08:08:28 UTC\r
+Last updated 2008-07-22 09:19:16 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:02 UTC\r
+Last updated 2008-07-22 09:19:16 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and\r
-Junio C Hamano <junkio@cox.net>. Significantly enhanced by\r
+Junio C Hamano <gitster@pobox.com>. Significantly enhanced by\r
Johannes Schindelin <Johannes.Schindelin@gmx.de>.</p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-16 03:23:21 UTC\r
+Last updated 2008-07-22 09:19:17 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>. Significantly enhanced by
+Junio C Hamano <gitster@pobox.com>. Significantly enhanced by
Johannes Schindelin <Johannes.Schindelin@gmx.de>.
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and\r
-Junio C Hamano <junkio@cox.net>.</p></div>\r
+Junio C Hamano <gitster@pobox.com>.</p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:04 UTC\r
+Last updated 2008-07-22 09:19:17 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>.
+Junio C Hamano <gitster@pobox.com>.
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:05 UTC\r
+Last updated 2008-07-22 09:19:17 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
GIT
---
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org>,\r
-Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.</p></div>\r
+Junio C Hamano <gitster@pobox.com> and Chris Wright <chrisw@osdl.org>.</p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:05 UTC\r
+Last updated 2008-07-22 09:19:17 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org>,
-Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.
+Junio C Hamano <gitster@pobox.com> and Chris Wright <chrisw@osdl.org>.
Documentation
--------------
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-update-server-info(1)</title>\r
</head>\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git update-server-info</em> [--force]</p>\r
+<div class="para"><p><em>git update-server-info</em> [--force]</p></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>A dumb server that does not do on-the-fly pack generations must\r
+<div class="para"><p>A dumb server that does not do on-the-fly pack generations must\r
have some auxiliary information files in $GIT_DIR/info and\r
$GIT_OBJECT_DIRECTORY/info directories to help clients discover\r
what references and packs the server has. This command\r
-generates such auxiliary files.</p>\r
+generates such auxiliary files.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
-f\r
</dt>\r
Update the info files from scratch.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>OUTPUT</h2>\r
+<h2 id="_output">OUTPUT</h2>\r
<div class="sectionbody">\r
-<p>Currently the command updates the following files. Please see\r
+<div class="para"><p>Currently the command updates the following files. Please see\r
<a href="gitrepository-layout.html">gitrepository-layout(5)</a> for description of\r
-what they are for:</p>\r
-<ul>\r
+what they are for:</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
objects/info/packs\r
info/refs\r
</p>\r
</li>\r
-</ul>\r
+</ul></div>\r
</div>\r
-<h2>BUGS</h2>\r
+<h2 id="_bugs">BUGS</h2>\r
<div class="sectionbody">\r
-<p>When you remove an existing ref, the command fails to update\r
-info/refs file unless <tt>--force</tt> flag is given.</p>\r
+<div class="para"><p>When you remove an existing ref, the command fails to update\r
+info/refs file unless <tt>--force</tt> flag is given.</p></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Junio C Hamano <junkio@cox.net></p>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by Junio C Hamano.</p>\r
+<div class="para"><p>Documentation by Junio C Hamano.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:06 UTC\r
+Last updated 2008-07-22 09:19:18 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
</div>\r
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<div class="para"><p>Written by Junio C Hamano <junkio@cox.net></p></div>\r
+<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:07 UTC\r
+Last updated 2008-07-22 09:19:18 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
-Written by Junio C Hamano <junkio@cox.net>
+Written by Junio C Hamano <gitster@pobox.com>
Documentation
--------------
<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> and\r
-Junio C Hamano <junkio@cox.net></p></div>\r
+Junio C Hamano <gitster@pobox.com></p></div>\r
</div>\r
<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-16 03:23:22 UTC\r
+Last updated 2008-07-22 09:19:18 UTC\r
</div>\r
</div>\r
</body>\r
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>
Documentation
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>GIT Howto Index</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>Here is a collection of mailing list postings made by various\r
-people describing how they use git in their workflow.</p>\r
-<ul>\r
+<div class="para"><p>Here is a collection of mailing list postings made by various\r
+people describing how they use git in their workflow.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="howto/maintain-git.txt">maintain-git</a> by Junio C Hamano <gitster@pobox.com>\r
</p>\r
</li>\r
-</ul>\r
-<p>Imagine that git development is racing along as usual, when our friendly\r
+</ul></div>\r
+<div class="para"><p>Imagine that git development is racing along as usual, when our friendly\r
neighborhood maintainer is struck down by a wayward bus. Out of the\r
hordes of suckers (loyal developers), you have been tricked (chosen) to\r
-step up as the new maintainer. This howto will show you "how to" do it.</p>\r
-<ul>\r
+step up as the new maintainer. This howto will show you "how to" do it.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="howto/rebase-and-edit.txt">rebase-and-edit</a> by Linus Torvalds <torvalds@osdl.org>\r
</p>\r
</li>\r
-</ul>\r
-<p>In this article, Linus demonstrates how a broken commit\r
+</ul></div>\r
+<div class="para"><p>In this article, Linus demonstrates how a broken commit\r
in a sequence of commits can be removed by rewinding the head and\r
-reapplying selected changes.</p>\r
-<ul>\r
+reapplying selected changes.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
-<a href="howto/rebase-from-internal-branch.txt">rebase-from-internal-branch</a> by Junio C Hamano <junkio@cox.net>\r
+<a href="howto/rebase-from-internal-branch.txt">rebase-from-internal-branch</a> by Junio C Hamano <gitster@pobox.com>\r
</p>\r
</li>\r
-</ul>\r
-<p>In this article, JC talks about how he rebases the\r
+</ul></div>\r
+<div class="para"><p>In this article, JC talks about how he rebases the\r
public "pu" branch using the core GIT tools when he updates\r
the "master" branch, and how "rebase" works. Also discussed\r
is how this applies to individual developers who sends patches\r
-upstream.</p>\r
-<ul>\r
+upstream.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
-<a href="howto/rebuild-from-update-hook.txt">rebuild-from-update-hook</a> by Junio C Hamano <junkio@cox.net>\r
+<a href="howto/rebuild-from-update-hook.txt">rebuild-from-update-hook</a> by Junio C Hamano <gitster@pobox.com>\r
</p>\r
</li>\r
-</ul>\r
-<p>In this how-to article, JC talks about how he\r
+</ul></div>\r
+<div class="para"><p>In this how-to article, JC talks about how he\r
uses the post-update hook to automate git documentation page\r
-shown at http://www.kernel.org/pub/software/scm/git/docs/.</p>\r
-<ul>\r
+shown at http://www.kernel.org/pub/software/scm/git/docs/.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="howto/recover-corrupted-blob-object.txt">recover-corrupted-blob-object</a> by Linus Torvalds <torvalds@linux-foundation.org>\r
</p>\r
</li>\r
-</ul>\r
-<p>Some tricks to reconstruct blob objects in order to fix\r
-a corrupted repository.</p>\r
-<ul>\r
+</ul></div>\r
+<div class="para"><p>Some tricks to reconstruct blob objects in order to fix\r
+a corrupted repository.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
-<a href="howto/revert-branch-rebase.html">revert-branch-rebase</a> by Junio C Hamano <junkio@cox.net>\r
+<a href="howto/revert-branch-rebase.html">revert-branch-rebase</a> by Junio C Hamano <gitster@pobox.com>\r
</p>\r
</li>\r
-</ul>\r
-<p>In this article, JC gives a small real-life example of using\r
+</ul></div>\r
+<div class="para"><p>In this article, JC gives a small real-life example of using\r
<em>git revert</em> command, and using a temporary branch and tag for safety\r
-and easier sanity checking.</p>\r
-<ul>\r
+and easier sanity checking.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
-<a href="howto/separating-topic-branches.txt">separating-topic-branches</a> by Junio C Hamano <junkio@cox.net>\r
+<a href="howto/separating-topic-branches.txt">separating-topic-branches</a> by Junio C Hamano <gitster@pobox.com>\r
</p>\r
</li>\r
-</ul>\r
-<p>In this article, JC describes how to separate topic branches.</p>\r
-<ul>\r
+</ul></div>\r
+<div class="para"><p>In this article, JC describes how to separate topic branches.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="howto/setup-git-server-over-http.txt">setup-git-server-over-http</a> by Rutger Nijlunsing <rutger@nospam.com>\r
</li>\r
<li>\r
<p>\r
-<a href="howto/update-hook-example.txt">update-hook-example</a> by Junio C Hamano <junkio@cox.net> and Carl Baldwin <cnb@fc.hp.com>\r
+<a href="howto/update-hook-example.txt">update-hook-example</a> by Junio C Hamano <gitster@pobox.com> and Carl Baldwin <cnb@fc.hp.com>\r
</p>\r
</li>\r
-</ul>\r
-<p>An example hooks/update script is presented to\r
+</ul></div>\r
+<div class="para"><p>An example hooks/update script is presented to\r
implement repository maintenance policies, such as who can push\r
-into which branch and who can make a tag.</p>\r
-<ul>\r
+into which branch and who can make a tag.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="howto/use-git-daemon.txt">use-git-daemon</a>\r
<a href="howto/using-merge-subtree.html">using-merge-subtree</a> by Sean <seanlkml@sympatico.ca>\r
</p>\r
</li>\r
-</ul>\r
-<p>In this article, Sean demonstrates how one can use the subtree merge\r
-strategy.</p>\r
+</ul></div>\r
+<div class="para"><p>In this article, Sean demonstrates how one can use the subtree merge\r
+strategy.</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:14 UTC\r
+Last updated 2008-07-22 09:19:19 UTC\r
</div>\r
</div>\r
</body>\r
reapplying selected changes.
-* link:howto/rebase-from-internal-branch.txt[rebase-from-internal-branch] by Junio C Hamano <junkio@cox.net>
+* link:howto/rebase-from-internal-branch.txt[rebase-from-internal-branch] by Junio C Hamano <gitster@pobox.com>
In this article, JC talks about how he rebases the
public "pu" branch using the core GIT tools when he updates
upstream.
-* link:howto/rebuild-from-update-hook.txt[rebuild-from-update-hook] by Junio C Hamano <junkio@cox.net>
+* link:howto/rebuild-from-update-hook.txt[rebuild-from-update-hook] by Junio C Hamano <gitster@pobox.com>
In this how-to article, JC talks about how he
uses the post-update hook to automate git documentation page
a corrupted repository.
-* link:howto/revert-branch-rebase.html[revert-branch-rebase] by Junio C Hamano <junkio@cox.net>
+* link:howto/revert-branch-rebase.html[revert-branch-rebase] by Junio C Hamano <gitster@pobox.com>
In this article, JC gives a small real-life example of using
'git revert' command, and using a temporary branch and tag for safety
and easier sanity checking.
-* link:howto/separating-topic-branches.txt[separating-topic-branches] by Junio C Hamano <junkio@cox.net>
+* link:howto/separating-topic-branches.txt[separating-topic-branches] by Junio C Hamano <gitster@pobox.com>
In this article, JC describes how to separate topic branches.
-* link:howto/update-hook-example.txt[update-hook-example] by Junio C Hamano <junkio@cox.net> and Carl Baldwin <cnb@fc.hp.com>
+* link:howto/update-hook-example.txt[update-hook-example] by Junio C Hamano <gitster@pobox.com> and Carl Baldwin <cnb@fc.hp.com>
An example hooks/update script is presented to
implement repository maintenance policies, such as who can push
-From: Junio C Hamano <junkio@cox.net>
+From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Petr Baudis <pasky@suse.cz>, Linus Torvalds <torvalds@osdl.org>
Subject: Re: sending changesets from the middle of a git tree
Subject: [HOWTO] Using post-update hook
Message-ID: <7vy86o6usx.fsf@assigned-by-dhcp.cox.net>
-From: Junio C Hamano <junkio@cox.net>
+From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Aug 2005 18:19:10 -0700
Abstract: In this how-to article, JC talks about how he
uses the post-update hook to automate git documentation page
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>Reverting an existing commit</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>One of the changes I pulled into the <em>master</em> branch turns out to\r
+<div class="para"><p>One of the changes I pulled into the <em>master</em> branch turns out to\r
break building GIT with GCC 2.95. While they were well intentioned\r
portability fixes, keeping things working with gcc-2.95 was also\r
important. Here is what I did to revert the change in the <em>master</em>\r
branch and to adjust the <em>pu</em> branch, using core GIT tools and\r
-barebone Porcelain.</p>\r
-<p>First, prepare a throw-away branch in case I screw things up.</p>\r
+barebone Porcelain.</p></div>\r
+<div class="para"><p>First, prepare a throw-away branch in case I screw things up.</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git checkout -b revert-c99 master</tt></pre>\r
</div></div>\r
-<p>Now I am on the <em>revert-c99</em> branch. Let's figure out which commit to\r
+<div class="para"><p>Now I am on the <em>revert-c99</em> branch. Let's figure out which commit to\r
revert. I happen to know that the top of the <em>master</em> branch is a\r
merge, and its second parent (i.e. foreign commit I merged from) has\r
the change I would want to undo. Further I happen to know that that\r
-merge introduced 5 commits or so:</p>\r
+merge introduced 5 commits or so:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git show-branch --more=4 master master^2 | head\r
*+ [master^2~4] Replace zero-length array decls with [].\r
* [master~1] tutorial note about git branch</tt></pre>\r
</div></div>\r
-<p>The <em>—more=4</em> above means "after we reach the merge base of refs,\r
+<div class="para"><p>The <em>—more=4</em> above means "after we reach the merge base of refs,\r
show until we display four more common commits". That last commit\r
would have been where the "portable" branch was forked from the main\r
git.git repository, so this would show everything on both branches\r
since then. I just limited the output to the first handful using\r
-<em>head</em>.</p>\r
-<p>Now I know <em>master^2~4</em> (pronounce it as "find the second parent of\r
+<em>head</em>.</p></div>\r
+<div class="para"><p>Now I know <em>master^2~4</em> (pronounce it as "find the second parent of\r
the <em>master</em>, and then go four generations back following the first\r
parent") is the one I would want to revert. Since I also want to say\r
why I am reverting it, the <em>-n</em> flag is given to <em>git revert</em>. This\r
prevents it from actually making a commit, and instead <em>git revert</em>\r
-leaves the commit log message it wanted to use in <em>.msg</em> file:</p>\r
+leaves the commit log message it wanted to use in <em>.msg</em> file:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git revert -n master^2~4\r
$ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.\r
$ make clean test ;# make sure it did not cause other breakage.</tt></pre>\r
</div></div>\r
-<p>The reverted change makes sense (from reading the <em>diff</em> output), does\r
+<div class="para"><p>The reverted change makes sense (from reading the <em>diff</em> output), does\r
fix the problem (from <em>make CC=gcc-2.95</em> test), and does not cause new\r
-breakage (from the last <em>make test</em>). I'm ready to commit:</p>\r
+breakage (from the last <em>make test</em>). I'm ready to commit:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git commit -a -s ;# read .msg into the log,\r
# and explain why I am reverting.</tt></pre>\r
</div></div>\r
-<p>I could have screwed up in any of the above steps, but in the worst\r
+<div class="para"><p>I could have screwed up in any of the above steps, but in the worst\r
case I could just have done <em>git checkout master</em> to start over.\r
Fortunately I did not have to; what I have in the current branch\r
-<em>revert-c99</em> is what I want. So merge that back into <em>master</em>:</p>\r
+<em>revert-c99</em> is what I want. So merge that back into <em>master</em>:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git checkout master\r
server-info.c | 2 +-\r
5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre>\r
</div></div>\r
-<p>There is no need to redo the test at this point. We fast forwarded\r
-and we know <em>master</em> matches <em>revert-c99</em> exactly. In fact:</p>\r
+<div class="para"><p>There is no need to redo the test at this point. We fast forwarded\r
+and we know <em>master</em> matches <em>revert-c99</em> exactly. In fact:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git diff master..revert-c99</tt></pre>\r
</div></div>\r
-<p>says nothing.</p>\r
-<p>Then we rebase the <em>pu</em> branch as usual.</p>\r
+<div class="para"><p>says nothing.</p></div>\r
+<div class="para"><p>Then we rebase the <em>pu</em> branch as usual.</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git checkout pu\r
First trying simple merge strategy to cherry-pick.\r
Finished one cherry-pick.</tt></pre>\r
</div></div>\r
-<p>The temporary tag <em>pu-anchor</em> is me just being careful, in case <em>git\r
-rebase</em> screws up. After this, I can do these for sanity check:</p>\r
+<div class="para"><p>The temporary tag <em>pu-anchor</em> is me just being careful, in case <em>git\r
+rebase</em> screws up. After this, I can do these for sanity check:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git diff pu-anchor..pu ;# make sure we got the master fix.\r
$ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.\r
$ make clean test ;# make sure it did not cause other breakage.</tt></pre>\r
</div></div>\r
-<p>Everything is in the good order. I do not need the temporary branch\r
-nor tag anymore, so remove them:</p>\r
+<div class="para"><p>Everything is in the good order. I do not need the temporary branch\r
+nor tag anymore, so remove them:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ rm -f .git/refs/tags/pu-anchor\r
$ git branch -d revert-c99</tt></pre>\r
</div></div>\r
-<p>It was an emergency fix, so we might as well merge it into the\r
+<div class="para"><p>It was an emergency fix, so we might as well merge it into the\r
<em>release candidate</em> branch, although I expect the next release would\r
-be some days off:</p>\r
+be some days off:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git checkout rc\r
server-info.c | 2 +-\r
5 files changed, 8 insertions(+), 8 deletions(-)</tt></pre>\r
</div></div>\r
-<p>And the final repository status looks like this:</p>\r
+<div class="para"><p>And the final repository status looks like this:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt>$ git show-branch --more=1 master pu rc\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:15 UTC\r
+Last updated 2008-07-22 09:19:19 UTC\r
</div>\r
</div>\r
</body>\r
-From: Junio C Hamano <junkio@cox.net>
+From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [HOWTO] Reverting an existing commit
Abstract: In this article, JC gives a small real-life example of using
-From: Junio C Hamano <junkio@cox.net>
+From: Junio C Hamano <gitster@pobox.com>
Subject: Separating topic branches
Abstract: In this article, JC describes how to separate topic branches.
-From: Junio C Hamano <junkio@cox.net> and Carl Baldwin <cnb@fc.hp.com>
+From: Junio C Hamano <gitster@pobox.com> and Carl Baldwin <cnb@fc.hp.com>
Subject: control access to branches.
Date: Thu, 17 Nov 2005 23:55:32 -0800
Message-ID: <7vfypumlu3.fsf@assigned-by-dhcp.cox.net>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>GIT API Documents</title>\r
</head>\r
</div>\r
<div id="preamble">\r
<div class="sectionbody">\r
-<p>GIT has grown a set of internal API over time. This collection\r
-documents them.</p>\r
-<ul>\r
+<div class="para"><p>GIT has grown a set of internal API over time. This collection\r
+documents them.</p></div>\r
+<div class="ilist"><ul>\r
<li>\r
<p>\r
<a href="api-allocation-growing.html">allocation growing API</a>\r
</li>\r
<li>\r
<p>\r
-<a href="api-path-list.html">path-list API</a>\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
<a href="api-quote.html">quote API</a>\r
</p>\r
</li>\r
</li>\r
<li>\r
<p>\r
+<a href="api-string-list.html">string-list API</a>\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
<a href="api-tree-walking.html">tree walking API</a>\r
</p>\r
</li>\r
<a href="api-xdiff-interface.html">xdiff interface API</a>\r
</p>\r
</li>\r
-</ul>\r
-<p>2007-11-24</p>\r
+</ul></div>\r
+<div class="para"><p>2007-11-24</p></div>\r
</div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:02:23 UTC\r
+Last updated 2008-07-22 09:19:20 UTC\r
</div>\r
</div>\r
</body>\r
* link:api-lockfile.html[lockfile API]
* link:api-object-access.html[object access API]
* link:api-parse-options.html[parse-options API]
-* link:api-path-list.html[path-list API]
* link:api-quote.html[quote API]
* link:api-remote.html[Remotes configuration API]
* link:api-revision-walking.html[revision walking API]
* link:api-run-command.html[run-command API]
* link:api-setup.html[setup API]
* link:api-strbuf.html[strbuf API]
+* link:api-string-list.html[string-list API]
* link:api-tree-walking.html[tree walking API]
* link:api-xdiff-interface.html[xdiff interface API]
////////////////////////////////////////////////////////////////
+++ /dev/null
-path-list API
-=============
-
-The path_list API offers a data structure and functions to handle sorted
-and unsorted string lists.
-
-The name is a bit misleading, a path_list may store not only paths but
-strings in general.
-
-The caller:
-
-. Allocates and clears a `struct path_list` variable.
-
-. Initializes the members. You might want to set the flag `strdup_paths`
- if the strings should be strdup()ed. For example, this is necessary
- when you add something like git_path("..."), since that function returns
- a static buffer that will change with the next call to git_path().
-+
-If you need something advanced, you can manually malloc() the `items`
-member (you need this if you add things later) and you should set the
-`nr` and `alloc` members in that case, too.
-
-. Adds new items to the list, using `path_list_append` or `path_list_insert`.
-
-. Can check if a string is in the list using `path_list_has_path` or
- `unsorted_path_list_has_path` and get it from the list using
- `path_list_lookup` for sorted lists.
-
-. Can sort an unsorted list using `sort_path_list`.
-
-. Finally it should free the list using `path_list_clear`.
-
-Example:
-
-----
-struct path_list list;
-int i;
-
-memset(&list, 0, sizeof(struct path_list));
-path_list_append("foo", &list);
-path_list_append("bar", &list);
-for (i = 0; i < list.nr; i++)
- printf("%s\n", list.items[i].path)
-----
-
-NOTE: It is more efficient to build an unsorted list and sort it
-afterwards, instead of building a sorted list (`O(n log n)` instead of
-`O(n^2)`).
-+
-However, if you use the list to check if a certain string was added
-already, you should not do that (using unsorted_path_list_has_path()),
-because the complexity would be quadratic again (but with a worse factor).
-
-Functions
----------
-
-* General ones (works with sorted and unsorted lists as well)
-
-`print_path_list`::
-
- Dump a path_list to stdout, useful mainly for debugging purposes. It
- can take an optional header argument and it writes out the
- string-pointer pairs of the path_list, each one in its own line.
-
-`path_list_clear`::
-
- Free a path_list. The `path` pointer of the items will be freed in case
- the `strdup_paths` member of the path_list is set. The second parameter
- controls if the `util` pointer of the items should be freed or not.
-
-* Functions for sorted lists only
-
-`path_list_has_path`::
-
- Determine if the path_list has a given string or not.
-
-`path_list_insert`::
-
- Insert a new element to the path_list. The returned pointer can be handy
- if you want to write something to the `util` pointer of the
- path_list_item containing the just added string.
-+
-Since this function uses xrealloc() (which die()s if it fails) if the
-list needs to grow, it is safe not to check the pointer. I.e. you may
-write `path_list_insert(...)->util = ...;`.
-
-`path_list_lookup`::
-
- Look up a given string in the path_list, returning the containing
- path_list_item. If the string is not found, NULL is returned.
-
-* Functions for unsorted lists only
-
-`path_list_append`::
-
- Append a new string to the end of the path_list.
-
-`sort_path_list`::
-
- Make an unsorted list sorted.
-
-`unsorted_path_list_has_path`::
-
- It's like `path_list_has_path()` but for unsorted lists.
-+
-This function needs to look through all items, as opposed to its
-counterpart for sorted lists, which performs a binary search.
-
-Data structures
----------------
-
-* `struct path_list_item`
-
-Represents an item of the list. The `path` member is a pointer to the
-string, and you may use the `util` member for any purpose, if you want.
-
-* `struct path_list`
-
-Represents the list itself.
-
-. The array of items are available via the `items` member.
-. The `nr` member contains the number of items stored in the list.
-. The `alloc` member is used to avoid reallocating at every insertion.
- You should not tamper with it.
-. Setting the `strdup_paths` member to 1 will strdup() the strings
- before adding them, see above.
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+ border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+ margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
+\r
+em {\r
+ font-style: italic;\r
+}\r
+\r
+strong {\r
+ font-weight: bold;\r
+}\r
+\r
+tt {\r
+ color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ margin-top: 1.2em;\r
+ margin-bottom: 0.5em;\r
+ line-height: 1.3;\r
+}\r
+\r
+h1, h2, h3 {\r
+ border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+ padding-top: 0.5em;\r
+}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
+\r
+div.sectionbody {\r
+ font-family: serif;\r
+ margin-left: 0;\r
+}\r
+\r
+hr {\r
+ border: 1px solid silver;\r
+}\r
+\r
+p {\r
+ margin-top: 0.5em;\r
+ margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+ padding: 0;\r
+ margin: 0;\r
+}\r
+\r
+span#author {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ font-size: 1.1em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+ font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+ font-family: sans-serif;\r
+ font-size: small;\r
+ border-top: 2px solid silver;\r
+ padding-top: 0.5em;\r
+ margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+ float: left;\r
+ padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+ float: right;\r
+ padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+ margin-right: 10%;\r
+ margin-top: 1.5em;\r
+ margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+ margin-top: 2.5em;\r
+ margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+ padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ text-align: left;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+ margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+ margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+ margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+ margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+ background: #ffffee;\r
+ border: 1px solid silver;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
+div.listingblock > div.content {\r
+ border: 1px solid silver;\r
+ background: #f4f4f4;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+ padding-left: 2.0em;\r
+}\r
+\r
+div.attribution {\r
+ text-align: right;\r
+}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+ vertical-align: top;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ text-decoration: underline;\r
+ color: #527bbd;\r
+ padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+ padding-left: 0.5em;\r
+ border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+ border-left: 2px solid silver;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+ white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+ margin-top: 0.8em;\r
+ margin-bottom: 0.8em;\r
+}\r
+dt {\r
+ margin-top: 0.5em;\r
+ margin-bottom: 0;\r
+ font-style: italic;\r
+}\r
+dd > *:first-child {\r
+ margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+ list-style-position: outside;\r
+}\r
+div.olist2 ol {\r
+ list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+ border: 3px solid #527bbd;\r
+}\r
+thead {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+}\r
+tfoot {\r
+ font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+ margin-top: 0.8em;\r
+ margin-bottom: 0.8em;\r
+}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
+td.hlist1 {\r
+ vertical-align: top;\r
+ font-style: italic;\r
+ padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+ vertical-align: top;\r
+}\r
+\r
+@media print {\r
+ div#footer-badges { display: none; }\r
+}\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+ background: #ffffee;\r
+ border: 1px solid silver;\r
+ padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+ font-family: sans-serif;\r
+ font-weight: bold;\r
+ margin-top: 0.0em;\r
+ margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+ border: 1px solid silver;\r
+ background: #f4f4f4;\r
+ padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+ padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+ border-left: 2px solid silver;\r
+ padding-left: 0.5em;\r
+}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
+</style>\r
+<title>string-list API</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>string-list API</h1>\r
+</div>\r
+<div id="preamble">\r
+<div class="sectionbody">\r
+<div class="para"><p>The string_list API offers a data structure and functions to handle sorted\r
+and unsorted string lists.</p></div>\r
+<div class="para"><p>The <em>string_list</em> struct used to be called <em>path_list</em>, but was renamed\r
+because it is not specific to paths.</p></div>\r
+<div class="para"><p>The caller:</p></div>\r
+<div class="olist"><ol>\r
+<li>\r
+<p>\r
+Allocates and clears a <tt>struct string_list</tt> variable.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Initializes the members. You might want to set the flag <tt>strdup_strings</tt>\r
+ if the strings should be strdup()ed. For example, this is necessary\r
+ when you add something like git_path("…"), since that function returns\r
+ a static buffer that will change with the next call to git_path().\r
+</p>\r
+<div class="para"><p>If you need something advanced, you can manually malloc() the <tt>items</tt>\r
+member (you need this if you add things later) and you should set the\r
+<tt>nr</tt> and <tt>alloc</tt> members in that case, too.</p></div>\r
+</li>\r
+<li>\r
+<p>\r
+Adds new items to the list, using <tt>string_list_append</tt> or\r
+ <tt>string_list_insert</tt>.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Can check if a string is in the list using <tt>string_list_has_string</tt> or\r
+ <tt>unsorted_string_list_has_string</tt> and get it from the list using\r
+ <tt>string_list_lookup</tt> for sorted lists.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Can sort an unsorted list using <tt>sort_string_list</tt>.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Finally it should free the list using <tt>string_list_clear</tt>.\r
+</p>\r
+</li>\r
+</ol></div>\r
+<div class="para"><p>Example:</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>struct string_list list;\r
+int i;\r
+\r
+memset(&list, 0, sizeof(struct string_list));\r
+string_list_append("foo", &list);\r
+string_list_append("bar", &list);\r
+for (i = 0; i < list.nr; i++)\r
+ printf("%s\n", list.items[i].path)</tt></pre>\r
+</div></div>\r
+<div class="admonitionblock">\r
+<table><tr>\r
+<td class="icon">\r
+<div class="title">Note</div>\r
+</td>\r
+<td class="content">It is more efficient to build an unsorted list and sort it\r
+afterwards, instead of building a sorted list (<tt>O(n log n)</tt> instead of\r
+<tt>O(n^2)</tt>).</td>\r
+</tr></table>\r
+</div>\r
+<div class="para"><p>+\r
+However, if you use the list to check if a certain string was added\r
+already, you should not do that (using unsorted_string_list_has_string()),\r
+because the complexity would be quadratic again (but with a worse factor).</p></div>\r
+</div>\r
+</div>\r
+<h2 id="_functions">Functions</h2>\r
+<div class="sectionbody">\r
+<div class="ilist"><ul>\r
+<li>\r
+<p>\r
+General ones (works with sorted and unsorted lists as well)\r
+</p>\r
+<div class="vlist"><dl>\r
+<dt>\r
+<tt>print_string_list</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Dump a string_list to stdout, useful mainly for debugging purposes. It\r
+ can take an optional header argument and it writes out the\r
+ string-pointer pairs of the string_list, each one in its own line.\r
+</p>\r
+</dd>\r
+<dt>\r
+<tt>string_list_clear</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Free a string_list. The <tt>string</tt> pointer of the items will be freed in\r
+ case the <tt>strdup_strings</tt> member of the string_list is set. The second\r
+ parameter controls if the <tt>util</tt> pointer of the items should be freed\r
+ or not.\r
+</p>\r
+</dd>\r
+</dl></div>\r
+</li>\r
+<li>\r
+<p>\r
+Functions for sorted lists only\r
+</p>\r
+<div class="vlist"><dl>\r
+<dt>\r
+<tt>string_list_has_string</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Determine if the string_list has a given string or not.\r
+</p>\r
+</dd>\r
+<dt>\r
+<tt>string_list_insert</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Insert a new element to the string_list. The returned pointer can be\r
+ handy if you want to write something to the <tt>util</tt> pointer of the\r
+ string_list_item containing the just added string.\r
+</p>\r
+<div class="para"><p>Since this function uses xrealloc() (which die()s if it fails) if the\r
+list needs to grow, it is safe not to check the pointer. I.e. you may\r
+write <tt>string_list_insert(…)->util = …;</tt>.</p></div>\r
+</dd>\r
+<dt>\r
+<tt>string_list_lookup</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Look up a given string in the string_list, returning the containing\r
+ string_list_item. If the string is not found, NULL is returned.\r
+</p>\r
+</dd>\r
+</dl></div>\r
+</li>\r
+<li>\r
+<p>\r
+Functions for unsorted lists only\r
+</p>\r
+<div class="vlist"><dl>\r
+<dt>\r
+<tt>string_list_append</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Append a new string to the end of the string_list.\r
+</p>\r
+</dd>\r
+<dt>\r
+<tt>sort_string_list</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Make an unsorted list sorted.\r
+</p>\r
+</dd>\r
+<dt>\r
+<tt>unsorted_string_list_has_string</tt>\r
+</dt>\r
+<dd>\r
+<p>\r
+ It's like <tt>string_list_has_string()</tt> but for unsorted lists.\r
+</p>\r
+<div class="para"><p>This function needs to look through all items, as opposed to its\r
+counterpart for sorted lists, which performs a binary search.</p></div>\r
+</dd>\r
+</dl></div>\r
+</li>\r
+</ul></div>\r
+</div>\r
+<h2 id="_data_structures">Data structures</h2>\r
+<div class="sectionbody">\r
+<div class="ilist"><ul>\r
+<li>\r
+<p>\r
+<tt>struct string_list_item</tt>\r
+</p>\r
+</li>\r
+</ul></div>\r
+<div class="para"><p>Represents an item of the list. The <tt>path</tt> member is a pointer to the\r
+string, and you may use the <tt>util</tt> member for any purpose, if you want.</p></div>\r
+<div class="ilist"><ul>\r
+<li>\r
+<p>\r
+<tt>struct string_list</tt>\r
+</p>\r
+</li>\r
+</ul></div>\r
+<div class="para"><p>Represents the list itself.</p></div>\r
+<div class="olist"><ol>\r
+<li>\r
+<p>\r
+The array of items are available via the <tt>items</tt> member.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+The <tt>nr</tt> member contains the number of items stored in the list.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+The <tt>alloc</tt> member is used to avoid reallocating at every insertion.\r
+ You should not tamper with it.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Setting the <tt>strdup_strings</tt> member to 1 will strdup() the strings\r
+ before adding them, see above.\r
+</p>\r
+</li>\r
+</ol></div>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 2008-07-22 09:19:19 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r
--- /dev/null
+string-list API
+===============
+
+The string_list API offers a data structure and functions to handle sorted
+and unsorted string lists.
+
+The 'string_list' struct used to be called 'path_list', but was renamed
+because it is not specific to paths.
+
+The caller:
+
+. Allocates and clears a `struct string_list` variable.
+
+. Initializes the members. You might want to set the flag `strdup_strings`
+ if the strings should be strdup()ed. For example, this is necessary
+ when you add something like git_path("..."), since that function returns
+ a static buffer that will change with the next call to git_path().
++
+If you need something advanced, you can manually malloc() the `items`
+member (you need this if you add things later) and you should set the
+`nr` and `alloc` members in that case, too.
+
+. Adds new items to the list, using `string_list_append` or
+ `string_list_insert`.
+
+. Can check if a string is in the list using `string_list_has_string` or
+ `unsorted_string_list_has_string` and get it from the list using
+ `string_list_lookup` for sorted lists.
+
+. Can sort an unsorted list using `sort_string_list`.
+
+. Finally it should free the list using `string_list_clear`.
+
+Example:
+
+----
+struct string_list list;
+int i;
+
+memset(&list, 0, sizeof(struct string_list));
+string_list_append("foo", &list);
+string_list_append("bar", &list);
+for (i = 0; i < list.nr; i++)
+ printf("%s\n", list.items[i].path)
+----
+
+NOTE: It is more efficient to build an unsorted list and sort it
+afterwards, instead of building a sorted list (`O(n log n)` instead of
+`O(n^2)`).
++
+However, if you use the list to check if a certain string was added
+already, you should not do that (using unsorted_string_list_has_string()),
+because the complexity would be quadratic again (but with a worse factor).
+
+Functions
+---------
+
+* General ones (works with sorted and unsorted lists as well)
+
+`print_string_list`::
+
+ Dump a string_list to stdout, useful mainly for debugging purposes. It
+ can take an optional header argument and it writes out the
+ string-pointer pairs of the string_list, each one in its own line.
+
+`string_list_clear`::
+
+ Free a string_list. The `string` pointer of the items will be freed in
+ case the `strdup_strings` member of the string_list is set. The second
+ parameter controls if the `util` pointer of the items should be freed
+ or not.
+
+* Functions for sorted lists only
+
+`string_list_has_string`::
+
+ Determine if the string_list has a given string or not.
+
+`string_list_insert`::
+
+ Insert a new element to the string_list. The returned pointer can be
+ handy if you want to write something to the `util` pointer of the
+ string_list_item containing the just added string.
++
+Since this function uses xrealloc() (which die()s if it fails) if the
+list needs to grow, it is safe not to check the pointer. I.e. you may
+write `string_list_insert(...)->util = ...;`.
+
+`string_list_lookup`::
+
+ Look up a given string in the string_list, returning the containing
+ string_list_item. If the string is not found, NULL is returned.
+
+* Functions for unsorted lists only
+
+`string_list_append`::
+
+ Append a new string to the end of the string_list.
+
+`sort_string_list`::
+
+ Make an unsorted list sorted.
+
+`unsorted_string_list_has_string`::
+
+ It's like `string_list_has_string()` but for unsorted lists.
++
+This function needs to look through all items, as opposed to its
+counterpart for sorted lists, which performs a binary search.
+
+Data structures
+---------------
+
+* `struct string_list_item`
+
+Represents an item of the list. The `path` member is a pointer to the
+string, and you may use the `util` member for any purpose, if you want.
+
+* `struct string_list`
+
+Represents the list itself.
+
+. The array of items are available via the `items` member.
+. The `nr` member contains the number of items stored in the list.
+. The `alloc` member is used to avoid reallocating at every insertion.
+ You should not tamper with it.
+. Setting the `strdup_strings` member to 1 will strdup() the strings
+ before adding them, see above.
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User's Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id
216085"></a>Git User's Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id294155">Preface</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-with-git-fetch">Updating a repository with git-fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-comments-with-given-content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-with-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-with-git-pull">Getting updates with git-pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git-rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-with-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git-fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -> index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -> object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -> index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -> working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git's source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. GIT Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="id294155"></a>Preface</h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User's Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.73.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id
409313"></a>Git User's Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id487384">Preface</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-with-git-fetch">Updating a repository with git-fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-comments-with-given-content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-with-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-with-git-pull">Getting updates with git-pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git-rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-with-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git-fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -> index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -> object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -> index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -> working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git's source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. GIT Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="id487384"></a>Preface</h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX
command-line skills, but no previous knowledge of git.</p><p><a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a> and <a class="xref" href="#exploring-git-history" title="Chapter 2. Exploring git history">Chapter 2, <i>Exploring git history</i></a> explain how
to fetch and study a project using git—read these chapters to learn how
to build and test a particular version of a software project, search for
commits without any merges, you may instead choose to use
<a class="ulink" href="git-rebase.html" target="_top">git-rebase(1)</a>:</p><div class="literallayout"><p>$ git checkout mywork<br>
$ git rebase origin</p></div><p>This will remove each of your commits from mywork, temporarily saving
-them as patches (in a directory named ".git/rebase"), update mywork to
+them as patches (in a directory named ".git/rebase-apply"), update mywork to
point at the latest version of origin, then apply each of the saved
patches to the new mywork. The result will look like:</p><pre class="literallayout"> o--o--O--o--o--o <-- origin
\
-------------------------------------------------
This will remove each of your commits from mywork, temporarily saving
-them as patches (in a directory named ".git/rebase"), update mywork to
+them as patches (in a directory named ".git/rebase-apply"), update mywork to
point at the latest version of origin, then apply each of the saved
patches to the new mywork. The result will look like:
projects / git.git / commitdiff