diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-01-31 05:03:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-01-31 05:03:45 +0000 |
| commit | 103b5722e7729973bb843e748abe7d4c8f8f9a28 (patch) | |
| tree | 41df9ce814249f764ea481aa0be0d4ae558a5a73 /git-rerere.html | |
| parent | 80d5846a03ed076d5b5142f00d78047daef6ab45 (diff) | |
| download | git-htmldocs-103b5722e7729973bb843e748abe7d4c8f8f9a28.tar.gz | |
Autogenerated HTML docs for v1.7.4
Diffstat (limited to 'git-rerere.html')
| -rw-r--r-- | git-rerere.html | 204 |
1 files changed, 149 insertions, 55 deletions
diff --git a/git-rerere.html b/git-rerere.html index 23e398005..c1119b2b8 100644 --- a/git-rerere.html +++ b/git-rerere.html @@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.5" />
+<meta name="generator" content="AsciiDoc 8.4.5" />
+<title>git-rerere(1)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +27,12 @@ a:visited { em {
font-style: italic;
+ color: navy;
}
strong {
font-weight: bold;
+ color: #083194;
}
tt {
@@ -71,6 +74,10 @@ p { margin-bottom: 0.5em;
}
+ul, ol, li > p {
+ margin-top: 0;
+}
+
pre {
padding: 0;
margin: 0;
@@ -84,7 +91,7 @@ span#author { }
span#email {
}
-span#revision {
+span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
@@ -104,11 +111,13 @@ div#footer-badges { padding-bottom: 0.5em;
}
-div#preamble,
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
- margin-right: 10%;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
@@ -123,6 +132,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
@@ -149,22 +159,33 @@ div.sidebarblock > div.content { padding: 0.5em;
}
-div.listingblock {
- margin-right: 0%;
-}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
-div.quoteblock > div.content {
+div.quoteblock {
padding-left: 2.0em;
+ margin-right: 10%;
}
-
-div.attribution {
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
text-align: right;
}
+
+div.verseblock {
+ padding-left: 2.0em;
+ margin-right: 10%;
+}
+div.verseblock > div.content {
+ white-space: pre;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
@@ -187,13 +208,9 @@ div.exampleblock > div.content { padding: 0.5em;
}
-div.verseblock div.content {
- white-space: pre;
-}
-
div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
span.image img { border-style: none; }
+a.image:visited { color: white; }
dl {
margin-top: 0.8em;
@@ -202,18 +219,38 @@ dl { dt {
margin-top: 0.5em;
margin-bottom: 0;
- font-style: italic;
+ font-style: normal;
+ color: navy;
}
dd > *:first-child {
- margin-top: 0;
+ margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
-div.olist2 ol {
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
list-style-type: lower-alpha;
}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
div.tableblock > table {
border: 3px solid #527bbd;
@@ -225,22 +262,53 @@ thead { tfoot {
font-weight: bold;
}
+td > div.verse {
+ white-space: pre;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
-div.hlist {
+
+div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
-div.hlist td {
- padding-bottom: 5px;
+div.hdlist tr {
+ padding-bottom: 15px;
+}
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
}
-td.hlist1 {
+td.hdlist1 {
vertical-align: top;
- font-style: italic;
+ font-style: normal;
padding-right: 0.8em;
+ color: navy;
}
-td.hlist2 {
+td.hdlist2 {
vertical-align: top;
}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
@media print {
div#footer-badges { display: none; }
@@ -271,7 +339,24 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-include1::./stylesheets/xhtml11-manpage.css[]
+/* Overrides for manpage documents */
+h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+h2 {
+ border-style: none;
+}
+div.sectionbody {
+ margin-left: 5%;
+}
+
+@media print {
+ div#toc { display: none; }
+}
+
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -280,6 +365,7 @@ div.sidebar-content { padding: 0.5em;
}
div.sidebar-title, div.image-title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
@@ -292,8 +378,17 @@ div.listingblock div.content { padding: 0.5em;
}
-div.quoteblock-content {
- padding-left: 2.0em;
+div.quoteblock-attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock-content {
+ white-space: pre;
+}
+div.verseblock-attribution {
+ padding-top: 0.75em;
+ text-align: left;
}
div.exampleblock-content {
@@ -304,7 +399,6 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>git-rerere(1)</title>
</head>
<body>
<div id="header">
@@ -318,17 +412,17 @@ git-rerere(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
-<div class="para"><p><em>git rerere</em> [<em>clear</em>|<em>forget</em> [<pathspec>]|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div>
+<div class="paragraph"><p><em>git rerere</em> [<em>clear</em>|<em>forget</em> [<pathspec>]|<em>diff</em>|<em>status</em>|<em>gc</em>]</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>In a workflow employing relatively long lived topic branches,
+<div class="paragraph"><p>In a workflow employing relatively long lived topic branches,
the developer sometimes needs to resolve the same conflicts over
and over again until the topic branches are done (either merged
to the "release" branch, or sent out and accepted upstream).</p></div>
-<div class="para"><p>This command assists the developer in this process by recording
+<div class="paragraph"><p>This command assists the developer in this process by recording
conflicted automerge results and corresponding hand resolve results
on the initial manual merge, and applying previously recorded
hand resolutions to their corresponding automerge results.</p></div>
@@ -344,11 +438,11 @@ enable this command.</td> </div>
<h2 id="_commands">COMMANDS</h2>
<div class="sectionbody">
-<div class="para"><p>Normally, <em>git rerere</em> is run without arguments or user-intervention.
+<div class="paragraph"><p>Normally, <em>git rerere</em> is run without arguments or user-intervention.
However, it has several commands that allow it to interact with
its working state.</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
<em>clear</em>
</dt>
<dd>
@@ -358,7 +452,7 @@ aborted. Calling <em>git am [--skip|--abort]</em> or <em>git rebase [--skip|--a will automatically invoke this command.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
<em>forget</em> <pathspec>
</dt>
<dd>
@@ -367,7 +461,7 @@ This resets the conflict resolutions which rerere has recorded for the current conflict in <pathspec>. The <pathspec> is optional.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
<em>diff</em>
</dt>
<dd>
@@ -378,7 +472,7 @@ conflicts. Additional arguments are passed directly to the system <em>diff</em> command installed in PATH.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
<em>status</em>
</dt>
<dd>
@@ -387,7 +481,7 @@ Like <em>diff</em>, but this only prints the filenames that will be tracked for resolutions.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
<em>gc</em>
</dt>
<dd>
@@ -404,7 +498,7 @@ variables respectively. </div>
<h2 id="_discussion">DISCUSSION</h2>
<div class="sectionbody">
-<div class="para"><p>When your topic branch modifies an overlapping area that your
+<div class="paragraph"><p>When your topic branch modifies an overlapping area that your
master branch (or upstream) touched since your topic branch
forked from it, you may want to test it with the latest master,
even before your topic branch is ready to be pushed upstream:</p></div>
@@ -414,7 +508,7 @@ even before your topic branch is ready to be pushed upstream:</p></div> /
o---o---o---*---o---o master</tt></pre>
</div></div>
-<div class="para"><p>For such a test, you need to merge master and topic somehow.
+<div class="paragraph"><p>For such a test, you need to merge master and topic somehow.
One way to do it is to pull master into the topic branch:</p></div>
<div class="listingblock">
<div class="content">
@@ -425,11 +519,11 @@ One way to do it is to pull master into the topic branch:</p></div> / /
o---o---o---*---o---o master</tt></pre>
</div></div>
-<div class="para"><p>The commits marked with <tt>*</tt> touch the same area in the same
+<div class="paragraph"><p>The commits marked with <tt>*</tt> touch the same area in the same
file; you need to resolve the conflicts when creating the commit
marked with <tt>+</tt>. Then you can test the result to make sure your
work-in-progress still works with what is in the latest master.</p></div>
-<div class="para"><p>After this test merge, there are two ways to continue your work
+<div class="paragraph"><p>After this test merge, there are two ways to continue your work
on the topic. The easiest is to build on top of the test merge
commit <tt>+</tt>, and when your work in the topic branch is finally
ready, pull the topic branch into master, and/or ask the
@@ -448,13 +542,13 @@ in which case the final commit graph would look like this:</p></div> / / \
o---o---o---*---o---o---o---o---+ master</tt></pre>
</div></div>
-<div class="para"><p>When your topic branch is long-lived, however, your topic branch
+<div class="paragraph"><p>When your topic branch is long-lived, however, your topic branch
would end up having many such "Merge from master" commits on it,
which would unnecessarily clutter the development history.
Readers of the Linux kernel mailing list may remember that Linus
complained about such too frequent test merges when a subsystem
maintainer asked to pull from a branch full of "useless merges".</p></div>
-<div class="para"><p>As an alternative, to keep the topic branch clean of test
+<div class="paragraph"><p>As an alternative, to keep the topic branch clean of test
merges, you could blow away the test merge, and keep building on
top of the tip before the test merge:</p></div>
<div class="listingblock">
@@ -470,7 +564,7 @@ top of the tip before the test merge:</p></div> / \
o---o---o---*---o---o---o---o---+ master</tt></pre>
</div></div>
-<div class="para"><p>This would leave only one merge commit when your topic branch is
+<div class="paragraph"><p>This would leave only one merge commit when your topic branch is
finally ready and merged into the master branch. This merge
would require you to resolve the conflict, introduced by the
commits marked with <tt>*</tt>. However, this conflict is often the
@@ -478,14 +572,14 @@ same conflict you resolved when you created the test merge you blew away. <em>git rerere</em> helps you resolve this final
conflicted merge using the information from your earlier hand
resolve.</p></div>
-<div class="para"><p>Running the <em>git rerere</em> command immediately after a conflicted
+<div class="paragraph"><p>Running the <em>git rerere</em> command immediately after a conflicted
automerge records the conflicted working tree files, with the
usual conflict markers <tt><<<<<<<</tt>, <tt>=======</tt>, and <tt>>>>>>>></tt> in
them. Later, after you are done resolving the conflicts,
running <em>git rerere</em> again will record the resolved state of these
files. Suppose you did this when you created the test merge of
master into the topic branch.</p></div>
-<div class="para"><p>Next time, after seeing the same conflicted automerge,
+<div class="paragraph"><p>Next time, after seeing the same conflicted automerge,
running <em>git rerere</em> will perform a three-way merge between the
earlier conflicted automerge, the earlier manual resolution, and
the current conflicted automerge.
@@ -494,18 +588,18 @@ out to your working tree file, so you do not have to manually resolve it. Note that <em>git rerere</em> leaves the index file alone,
so you still need to do the final sanity checks with <tt>git diff</tt>
(or <tt>git diff -c</tt>) and <em>git add</em> when you are satisfied.</p></div>
-<div class="para"><p>As a convenience measure, <em>git merge</em> automatically invokes
+<div class="paragraph"><p>As a convenience measure, <em>git merge</em> automatically invokes
<em>git rerere</em> upon exiting with a failed automerge and <em>git rerere</em>
records the hand resolve when it is a new conflict, or reuses the earlier hand
resolve when it is not. <em>git commit</em> also invokes <em>git rerere</em>
when committing a merge result. What this means is that you do
not have to do anything special yourself (besides enabling
the rerere.enabled config variable).</p></div>
-<div class="para"><p>In our example, when you do the test merge, the manual
+<div class="paragraph"><p>In our example, when you do the test merge, the manual
resolution is recorded, and it will be reused when you do the
actual merge later with the updated master and topic branch, as long
as the recorded resolution is still applicable.</p></div>
-<div class="para"><p>The information <em>git rerere</em> records is also used when running
+<div class="paragraph"><p>The information <em>git rerere</em> records is also used when running
<em>git rebase</em>. After blowing away the test merge and continuing
development on the topic branch:</p></div>
<div class="listingblock">
@@ -520,7 +614,7 @@ development on the topic branch:</p></div> /
o---o---o---*---o---o---o---o master</tt></pre>
</div></div>
-<div class="para"><p>you could run <tt>git rebase master topic</tt>, to bring yourself
+<div class="paragraph"><p>you could run <tt>git rebase master topic</tt>, to bring yourself
up-to-date before your topic is ready to be sent upstream.
This would result in falling back to a three-way merge, and it
would conflict the same way as the test merge you resolved earlier.
@@ -529,15 +623,15 @@ conflict.</p></div> </div>
<h2 id="_author">Author</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com></p></div>
+<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>></p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-18 23:56:55 UTC
+Last updated 2010-07-05 23:25:05 UTC
</div>
</div>
</body>
|