Skip to content

Commit 25e7ba6

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.3.2-306-g4f4fa
1 parent b95b43d commit 25e7ba6

15 files changed

Lines changed: 137 additions & 89 deletions

‎git-config.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2695,7 +2695,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
26952695
Controls which merge resolution program is used by
26962696
<a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3",
26972697
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
2698-
"diffuse", "ecmerge", "tortoisemerge", and
2698+
"diffuse", "ecmerge", "tortoisemerge", "araxis", and
26992699
"opendiff". Any other value is treated is custom merge tool
27002700
and there must be a corresponding mergetool.&lt;tool&gt;.cmd option.
27012701
</p>
@@ -3328,7 +3328,7 @@ <h2 id="_git">GIT</h2>
33283328
</div>
33293329
<div id="footer">
33303330
<div id="footer-text">
3331-
Last updated 2009-06-01 01:22:20 UTC
3331+
Last updated 2009-06-14 01:03:00 UTC
33323332
</div>
33333333
</div>
33343334
</body>

‎git-difftool.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ <h2 id="_options">OPTIONS</h2>
363363
Use the diff tool specified by &lt;tool&gt;.
364364
Valid merge tools are:
365365
kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
366-
ecmerge, diffuse and opendiff
366+
ecmerge, diffuse, opendiff and araxis.
367367
</p>
368368
<div class="para"><p>If a diff tool is not specified, <em>git-difftool</em>
369369
will use the configuration variable <tt>diff.tool</tt>. If the
@@ -474,7 +474,7 @@ <h2 id="_git">GIT</h2>
474474
</div>
475475
<div id="footer">
476476
<div id="footer-text">
477-
Last updated 2009-04-18 06:17:31 UTC
477+
Last updated 2009-06-14 01:03:00 UTC
478478
</div>
479479
</div>
480480
</body>

‎git-difftool.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ OPTIONS
3131
Use the diff tool specified by <tool>.
3232
Valid merge tools are:
3333
kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
34-
ecmerge, diffuse and opendiff
34+
ecmerge, diffuse, opendiff and araxis.
3535
+
3636
If a diff tool is not specified, 'git-difftool'
3737
will use the configuration variable `diff.tool`. If the

‎git-merge.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ <h2 id="_configuration">CONFIGURATION</h2>
632632
Controls which merge resolution program is used by
633633
<a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3",
634634
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
635-
"diffuse", "ecmerge", "tortoisemerge", and
635+
"diffuse", "ecmerge", "tortoisemerge", "araxis", and
636636
"opendiff". Any other value is treated is custom merge tool
637637
and there must be a corresponding mergetool.&lt;tool&gt;.cmd option.
638638
</p>
@@ -922,7 +922,7 @@ <h2 id="_git">GIT</h2>
922922
</div>
923923
<div id="footer">
924924
<div id="footer-text">
925-
Last updated 2009-05-26 08:38:35 UTC
925+
Last updated 2009-06-14 01:03:00 UTC
926926
</div>
927927
</div>
928928
</body>

‎git-mergetool.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ <h2 id="_options">OPTIONS</h2>
345345
Use the merge resolution program specified by &lt;tool&gt;.
346346
Valid merge tools are:
347347
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
348-
diffuse, tortoisemerge and opendiff
348+
diffuse, tortoisemerge, opendiff and araxis.
349349
</p>
350350
<div class="para"><p>If a merge resolution program is not specified, <em>git-mergetool</em>
351351
will use the configuration variable <tt>merge.tool</tt>. If the
@@ -414,7 +414,7 @@ <h2 id="_git">GIT</h2>
414414
</div>
415415
<div id="footer">
416416
<div id="footer-text">
417-
Last updated 2009-04-18 06:17:32 UTC
417+
Last updated 2009-06-14 01:03:00 UTC
418418
</div>
419419
</div>
420420
</body>

‎git-mergetool.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ OPTIONS
2727
Use the merge resolution program specified by <tool>.
2828
Valid merge tools are:
2929
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
30-
diffuse, tortoisemerge and opendiff
30+
diffuse, tortoisemerge, opendiff and araxis.
3131
+
3232
If a merge resolution program is not specified, 'git-mergetool'
3333
will use the configuration variable `merge.tool`. If the

‎git-rerere.html‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -324,14 +324,14 @@ <h2>SYNOPSIS</h2>
324324
</div>
325325
<h2 id="_description">DESCRIPTION</h2>
326326
<div class="sectionbody">
327-
<div class="para"><p>In a workflow that employs relatively long lived topic branches,
328-
the developer sometimes needs to resolve the same conflict over
327+
<div class="para"><p>In a workflow employing relatively long lived topic branches,
328+
the developer sometimes needs to resolve the same conflicts over
329329
and over again until the topic branches are done (either merged
330330
to the "release" branch, or sent out and accepted upstream).</p></div>
331-
<div class="para"><p>This command helps this process by recording conflicted
332-
automerge results and corresponding hand-resolve results on the
333-
initial manual merge, and later by noticing the same automerge
334-
results and applying the previously recorded hand resolution.</p></div>
331+
<div class="para"><p>This command assists the developer in this process by recording
332+
conflicted automerge results and corresponding hand resolve results
333+
on the initial manual merge, and applying previously recorded
334+
hand resolutions to their corresponding automerge results.</p></div>
335335
<div class="admonitionblock">
336336
<table><tr>
337337
<td class="icon">
@@ -383,19 +383,19 @@ <h2 id="_commands">COMMANDS</h2>
383383
</dt>
384384
<dd>
385385
<p>
386-
This command is used to prune records of conflicted merge that
387-
occurred long time ago. By default, conflicts older than 15
388-
days that you have not recorded their resolution, and conflicts
389-
older than 60 days, are pruned. These are controlled with
386+
This prunes records of conflicted merges that
387+
occurred a long time ago. By default, unresolved conflicts older
388+
than 15 days and resolved conflicts older than 60
389+
days are pruned. These defaults are controlled via the
390390
<tt>gc.rerereunresolved</tt> and <tt>gc.rerereresolved</tt> configuration
391-
variables.
391+
variables respectively.
392392
</p>
393393
</dd>
394394
</dl></div>
395395
</div>
396396
<h2 id="_discussion">DISCUSSION</h2>
397397
<div class="sectionbody">
398-
<div class="para"><p>When your topic branch modifies overlapping area that your
398+
<div class="para"><p>When your topic branch modifies an overlapping area that your
399399
master branch (or upstream) touched since your topic branch
400400
forked from it, you may want to test it with the latest master,
401401
even before your topic branch is ready to be pushed upstream:</p></div>
@@ -464,39 +464,38 @@ <h2 id="_discussion">DISCUSSION</h2>
464464
<div class="para"><p>This would leave only one merge commit when your topic branch is
465465
finally ready and merged into the master branch. This merge
466466
would require you to resolve the conflict, introduced by the
467-
commits marked with <tt>*</tt>. However, often this conflict is the
467+
commits marked with <tt>*</tt>. However, this conflict is often the
468468
same conflict you resolved when you created the test merge you
469-
blew away. <em>git-rerere</em> command helps you to resolve this final
469+
blew away. <em>git-rerere</em> helps you resolve this final
470470
conflicted merge using the information from your earlier hand
471471
resolve.</p></div>
472472
<div class="para"><p>Running the <em>git-rerere</em> command immediately after a conflicted
473473
automerge records the conflicted working tree files, with the
474474
usual conflict markers <tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt>, <tt>=======</tt>, and <tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt> in
475475
them. Later, after you are done resolving the conflicts,
476-
running <em>git-rerere</em> again records the resolved state of these
476+
running <em>git-rerere</em> again will record the resolved state of these
477477
files. Suppose you did this when you created the test merge of
478478
master into the topic branch.</p></div>
479-
<div class="para"><p>Next time, running <em>git-rerere</em> after seeing a conflicted
480-
automerge, if the conflict is the same as the earlier one
481-
recorded, it is noticed and a three-way merge between the
479+
<div class="para"><p>Next time, after seeing the same conflicted automerge,
480+
running <em>git-rerere</em> will perform a three-way merge between the
482481
earlier conflicted automerge, the earlier manual resolution, and
483-
the current conflicted automerge is performed by the command.
482+
the current conflicted automerge.
484483
If this three-way merge resolves cleanly, the result is written
485-
out to your working tree file, so you would not have to manually
484+
out to your working tree file, so you do not have to manually
486485
resolve it. Note that <em>git-rerere</em> leaves the index file alone,
487486
so you still need to do the final sanity checks with <tt>git diff</tt>
488487
(or <tt>git diff -c</tt>) and <em>git-add</em> when you are satisfied.</p></div>
489488
<div class="para"><p>As a convenience measure, <em>git-merge</em> automatically invokes
490-
<em>git-rerere</em> when it exits with a failed automerge, which
491-
records it if it is a new conflict, or reuses the earlier hand
489+
<em>git-rerere</em> upon exiting with a failed automerge and <em>git-rerere</em>
490+
records the hand resolve when it is a new conflict, or reuses the earlier hand
492491
resolve when it is not. <em>git-commit</em> also invokes <em>git-rerere</em>
493-
when recording a merge result. What this means is that you do
494-
not have to do anything special yourself (Note: you still have
495-
to set the config variable rerere.enabled to enable this command).</p></div>
496-
<div class="para"><p>In our example, when you did the test merge, the manual
492+
when committing a merge result. What this means is that you do
493+
not have to do anything special yourself (besides enabling
494+
the rerere.enabled config variable).</p></div>
495+
<div class="para"><p>In our example, when you do the test merge, the manual
497496
resolution is recorded, and it will be reused when you do the
498-
actual merge later with updated master and topic branch, as long
499-
as the earlier resolution is still applicable.</p></div>
497+
actual merge later with the updated master and topic branch, as long
498+
as the recorded resolution is still applicable.</p></div>
500499
<div class="para"><p>The information <em>git-rerere</em> records is also used when running
501500
<em>git-rebase</em>. After blowing away the test merge and continuing
502501
development on the topic branch:</p></div>
@@ -512,11 +511,11 @@ <h2 id="_discussion">DISCUSSION</h2>
512511
/
513512
o---o---o---*---o---o---o---o master</tt></pre>
514513
</div></div>
515-
<div class="para"><p>you could run <tt>git rebase master topic</tt>, to keep yourself
516-
up-to-date even before your topic is ready to be sent upstream.
517-
This would result in falling back to three-way merge, and it
518-
would conflict the same way the test merge you resolved earlier.
519-
<em>git-rerere</em> is run by <em>git-rebase</em> to help you resolve this
514+
<div class="para"><p>you could run <tt>git rebase master topic</tt>, to bring yourself
515+
up-to-date before your topic is ready to be sent upstream.
516+
This would result in falling back to a three-way merge, and it
517+
would conflict the same way as the test merge you resolved earlier.
518+
<em>git-rerere</em> will be run by <em>git-rebase</em> to help you resolve this
520519
conflict.</p></div>
521520
</div>
522521
<h2 id="_author">Author</h2>
@@ -529,7 +528,7 @@ <h2 id="_git">GIT</h2>
529528
</div>
530529
<div id="footer">
531530
<div id="footer-text">
532-
Last updated 2009-04-02 06:50:02 UTC
531+
Last updated 2009-06-14 01:03:01 UTC
533532
</div>
534533
</div>
535534
</body>

‎git-rerere.txt‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ SYNOPSIS
1212
DESCRIPTION
1313
-----------
1414

15-
In a workflow that employs relatively long lived topic branches,
16-
the developer sometimes needs to resolve the same conflict over
15+
In a workflow employing relatively long lived topic branches,
16+
the developer sometimes needs to resolve the same conflicts over
1717
and over again until the topic branches are done (either merged
1818
to the "release" branch, or sent out and accepted upstream).
1919

20-
This command helps this process by recording conflicted
21-
automerge results and corresponding hand-resolve results on the
22-
initial manual merge, and later by noticing the same automerge
23-
results and applying the previously recorded hand resolution.
20+
This command assists the developer in this process by recording
21+
conflicted automerge results and corresponding hand resolve results
22+
on the initial manual merge, and applying previously recorded
23+
hand resolutions to their corresponding automerge results.
2424

2525
[NOTE]
2626
You need to set the configuration variable rerere.enabled to
@@ -54,18 +54,18 @@ for resolutions.
5454

5555
'gc'::
5656

57-
This command is used to prune records of conflicted merge that
58-
occurred long time ago. By default, conflicts older than 15
59-
days that you have not recorded their resolution, and conflicts
60-
older than 60 days, are pruned. These are controlled with
57+
This prunes records of conflicted merges that
58+
occurred a long time ago. By default, unresolved conflicts older
59+
than 15 days and resolved conflicts older than 60
60+
days are pruned. These defaults are controlled via the
6161
`gc.rerereunresolved` and `gc.rerereresolved` configuration
62-
variables.
62+
variables respectively.
6363

6464

6565
DISCUSSION
6666
----------
6767

68-
When your topic branch modifies overlapping area that your
68+
When your topic branch modifies an overlapping area that your
6969
master branch (or upstream) touched since your topic branch
7070
forked from it, you may want to test it with the latest master,
7171
even before your topic branch is ready to be pushed upstream:
@@ -140,43 +140,42 @@ top of the tip before the test merge:
140140
This would leave only one merge commit when your topic branch is
141141
finally ready and merged into the master branch. This merge
142142
would require you to resolve the conflict, introduced by the
143-
commits marked with `*`. However, often this conflict is the
143+
commits marked with `*`. However, this conflict is often the
144144
same conflict you resolved when you created the test merge you
145-
blew away. 'git-rerere' command helps you to resolve this final
145+
blew away. 'git-rerere' helps you resolve this final
146146
conflicted merge using the information from your earlier hand
147147
resolve.
148148

149149
Running the 'git-rerere' command immediately after a conflicted
150150
automerge records the conflicted working tree files, with the
151151
usual conflict markers `<<<<<<<`, `=======`, and `>>>>>>>` in
152152
them. Later, after you are done resolving the conflicts,
153-
running 'git-rerere' again records the resolved state of these
153+
running 'git-rerere' again will record the resolved state of these
154154
files. Suppose you did this when you created the test merge of
155155
master into the topic branch.
156156

157-
Next time, running 'git-rerere' after seeing a conflicted
158-
automerge, if the conflict is the same as the earlier one
159-
recorded, it is noticed and a three-way merge between the
157+
Next time, after seeing the same conflicted automerge,
158+
running 'git-rerere' will perform a three-way merge between the
160159
earlier conflicted automerge, the earlier manual resolution, and
161-
the current conflicted automerge is performed by the command.
160+
the current conflicted automerge.
162161
If this three-way merge resolves cleanly, the result is written
163-
out to your working tree file, so you would not have to manually
162+
out to your working tree file, so you do not have to manually
164163
resolve it. Note that 'git-rerere' leaves the index file alone,
165164
so you still need to do the final sanity checks with `git diff`
166165
(or `git diff -c`) and 'git-add' when you are satisfied.
167166

168167
As a convenience measure, 'git-merge' automatically invokes
169-
'git-rerere' when it exits with a failed automerge, which
170-
records it if it is a new conflict, or reuses the earlier hand
168+
'git-rerere' upon exiting with a failed automerge and 'git-rerere'
169+
records the hand resolve when it is a new conflict, or reuses the earlier hand
171170
resolve when it is not. 'git-commit' also invokes 'git-rerere'
172-
when recording a merge result. What this means is that you do
173-
not have to do anything special yourself (Note: you still have
174-
to set the config variable rerere.enabled to enable this command).
171+
when committing a merge result. What this means is that you do
172+
not have to do anything special yourself (besides enabling
173+
the rerere.enabled config variable).
175174

176-
In our example, when you did the test merge, the manual
175+
In our example, when you do the test merge, the manual
177176
resolution is recorded, and it will be reused when you do the
178-
actual merge later with updated master and topic branch, as long
179-
as the earlier resolution is still applicable.
177+
actual merge later with the updated master and topic branch, as long
178+
as the recorded resolution is still applicable.
180179

181180
The information 'git-rerere' records is also used when running
182181
'git-rebase'. After blowing away the test merge and continuing
@@ -194,11 +193,11 @@ development on the topic branch:
194193
o---o---o---*---o---o---o---o master
195194
------------
196195

197-
you could run `git rebase master topic`, to keep yourself
198-
up-to-date even before your topic is ready to be sent upstream.
199-
This would result in falling back to three-way merge, and it
200-
would conflict the same way the test merge you resolved earlier.
201-
'git-rerere' is run by 'git-rebase' to help you resolve this
196+
you could run `git rebase master topic`, to bring yourself
197+
up-to-date before your topic is ready to be sent upstream.
198+
This would result in falling back to a three-way merge, and it
199+
would conflict the same way as the test merge you resolved earlier.
200+
'git-rerere' will be run by 'git-rebase' to help you resolve this
202201
conflict.
203202

204203

‎git-send-email.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ <h3 id="_automating">Automating</h3><div style="clear:left"></div>
549549
</p>
550550
</dd>
551551
<dt>
552-
--[no-]chain-reply-to=&lt;identifier&gt;
552+
--[no-]chain-reply-to
553553
</dt>
554554
<dd>
555555
<p>
@@ -656,7 +656,8 @@ <h3 id="_automating">Automating</h3><div style="clear:left"></div>
656656
<p>
657657
If this is set, the In-Reply-To header will be set on each email sent.
658658
If disabled with "--no-thread", no emails will have the In-Reply-To
659-
header set. Default is the value of the <em>sendemail.thread</em> configuration
659+
header set, unless specified with --in-reply-to.
660+
Default is the value of the <em>sendemail.thread</em> configuration
660661
value; if that is unspecified, default to --thread.
661662
</p>
662663
</dd>
@@ -811,7 +812,7 @@ <h2 id="_git">GIT</h2>
811812
</div>
812813
<div id="footer">
813814
<div id="footer-text">
814-
Last updated 2009-06-12 08:57:13 UTC
815+
Last updated 2009-06-14 01:03:01 UTC
815816
</div>
816817
</div>
817818
</body>

‎git-send-email.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Automating
165165
Output of this command must be single email address per line.
166166
Default is the value of 'sendemail.cccmd' configuration value.
167167

168-
--[no-]chain-reply-to=<identifier>::
168+
--[no-]chain-reply-to::
169169
If this is set, each email will be sent as a reply to the previous
170170
email sent. If disabled with "--no-chain-reply-to", all emails after
171171
the first will be sent as replies to the first email sent. When using
@@ -214,7 +214,8 @@ specified, as well as 'body' if --no-signed-off-cc is specified.
214214
--[no-]thread::
215215
If this is set, the In-Reply-To header will be set on each email sent.
216216
If disabled with "--no-thread", no emails will have the In-Reply-To
217-
header set. Default is the value of the 'sendemail.thread' configuration
217+
header set, unless specified with --in-reply-to.
218+
Default is the value of the 'sendemail.thread' configuration
218219
value; if that is unspecified, default to --thread.
219220

220221

0 commit comments

Comments
 (0)