Skip to content

Commit cc7636a

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.7.1-226-g770c5
1 parent e97d577 commit cc7636a

25 files changed

+589
-67
lines changed

‎blame-options.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ of lines before or after the line given by <start>.
9090
running extra passes of inspection.
9191
+
9292
<num> is optional but it is the lower bound on the number of
93-
alphanumeric characters that git must detect as moving
93+
alphanumeric characters that git must detect as moving/copying
9494
within a file for it to associate those lines with the parent
95-
commit.
95+
commit. The default value is 20.
9696

9797
-C|<num>|::
9898
In addition to `-M`, detect lines moved or copied from other
@@ -105,9 +105,11 @@ commit.
105105
looks for copies from other files in any commit.
106106
+
107107
<num> is optional but it is the lower bound on the number of
108-
alphanumeric characters that git must detect as moving
108+
alphanumeric characters that git must detect as moving/copying
109109
between files for it to associate those lines with the parent
110-
commit.
110+
commit. And the default value is 40. If there are more than one
111+
`-C` options given, the <num> argument of the last `-C` will
112+
take effect.
111113

112114
-h::
113115
--help::

‎config.txt‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -946,13 +946,19 @@ gc.pruneexpire::
946946
unreachable objects immediately.
947947

948948
gc.reflogexpire::
949+
gc.<pattern>.reflogexpire::
949950
'git reflog expire' removes reflog entries older than
950-
this time; defaults to 90 days.
951+
this time; defaults to 90 days. With "<pattern>" (e.g.
952+
"refs/stash") in the middle the setting applies only to
953+
the refs that match the <pattern>.
951954

952955
gc.reflogexpireunreachable::
956+
gc.<ref>.reflogexpireunreachable::
953957
'git reflog expire' removes reflog entries older than
954958
this time and are not reachable from the current tip;
955-
defaults to 30 days.
959+
defaults to 30 days. With "<pattern>" (e.g. "refs/stash")
960+
in the middle, the setting applies only to the refs that
961+
match the <pattern>.
956962

957963
gc.rerereresolved::
958964
Records of conflicted merge you resolved earlier are
@@ -1587,7 +1593,9 @@ remote.<name>.uploadpack::
15871593

15881594
remote.<name>.tagopt::
15891595
Setting this value to \--no-tags disables automatic tag following when
1590-
fetching from remote <name>
1596+
fetching from remote <name>. Setting it to \--tags will fetch every
1597+
tag from remote <name>, even if they are not reachable from remote
1598+
branch heads.
15911599

15921600
remote.<name>.vcs::
15931601
Setting this to a value <vcs> will cause git to interact with

‎diff-options.txt‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,39 @@ any of those replacements occurred.
127127
gives the default to color output.
128128
Same as `--color=never`.
129129

130-
--color-words[=<regex>]::
131-
Show colored word diff, i.e., color words which have changed.
132-
By default, words are separated by whitespace.
130+
--word-diff[=<mode>]::
131+
Show a word diff, using the <mode> to delimit changed words.
132+
By default, words are delimited by whitespace; see
133+
`--word-diff-regex` below. The <mode> defaults to 'plain', and
134+
must be one of:
135+
+
136+
--
137+
color::
138+
Highlight changed words using only colors. Implies `--color`.
139+
plain::
140+
Show words as `[-removed-]` and `{+added+}`. Makes no
141+
attempts to escape the delimiters if they appear in the input,
142+
so the output may be ambiguous.
143+
porcelain::
144+
Use a special line-based format intended for script
145+
consumption. Added/removed/unchanged runs are printed in the
146+
usual unified diff format, starting with a `+`/`-`/` `
147+
character at the beginning of the line and extending to the
148+
end of the line. Newlines in the input are represented by a
149+
tilde `~` on a line of its own.
150+
none::
151+
Disable word diff again.
152+
--
153+
+
154+
Note that despite the name of the first mode, color is used to
155+
highlight the changed parts in all modes if enabled.
156+
157+
--word-diff-regex=<regex>::
158+
Use <regex> to decide what a word is, instead of considering
159+
runs of non-whitespace to be a word. Also implies
160+
`--word-diff` unless it was already enabled.
133161
+
134-
When a <regex> is specified, every non-overlapping match of the
162+
Every non-overlapping match of the
135163
<regex> is considered a word. Anything between these matches is
136164
considered whitespace and ignored(!) for the purposes of finding
137165
differences. You may want to append `|[^[:space:]]` to your regular
@@ -143,6 +171,10 @@ The regex can also be set via a diff driver or configuration option, see
143171
linkgit:gitattributes[1] or linkgit:git-config[1]. Giving it explicitly
144172
overrides any diff driver or configuration setting. Diff drivers
145173
override configuration settings.
174+
175+
--color-words[=<regex>]::
176+
Equivalent to `--word-diff=color` plus (if a regex was
177+
specified) `--word-diff-regex=<regex>`.
146178
endif::git-format-patch[]
147179

148180
--no-renames::

‎git-annotate.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,9 @@ <h2 id="_options">OPTIONS</h2>
502502
running extra passes of inspection.
503503
</p>
504504
<div class="para"><p>&lt;num&gt; is optional but it is the lower bound on the number of
505-
alphanumeric characters that git must detect as moving
505+
alphanumeric characters that git must detect as moving/copying
506506
within a file for it to associate those lines with the parent
507-
commit.</p></div>
507+
commit. The default value is 20.</p></div>
508508
</dd>
509509
<dt>
510510
-C|&lt;num&gt;|
@@ -521,9 +521,11 @@ <h2 id="_options">OPTIONS</h2>
521521
looks for copies from other files in any commit.
522522
</p>
523523
<div class="para"><p>&lt;num&gt; is optional but it is the lower bound on the number of
524-
alphanumeric characters that git must detect as moving
524+
alphanumeric characters that git must detect as moving/copying
525525
between files for it to associate those lines with the parent
526-
commit.</p></div>
526+
commit. And the default value is 40. If there are more than one
527+
<tt>-C</tt> options given, the &lt;num&gt; argument of the last <tt>-C</tt> will
528+
take effect.</p></div>
527529
</dd>
528530
<dt>
529531
-h
@@ -552,7 +554,7 @@ <h2 id="_git">GIT</h2>
552554
</div>
553555
<div id="footer">
554556
<div id="footer-text">
555-
Last updated 2010-04-24 02:55:46 UTC
557+
Last updated 2010-05-21 14:57:14 UTC
556558
</div>
557559
</div>
558560
</body>

‎git-blame.html‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -516,9 +516,9 @@ <h2 id="_options">OPTIONS</h2>
516516
running extra passes of inspection.
517517
</p>
518518
<div class="para"><p>&lt;num&gt; is optional but it is the lower bound on the number of
519-
alphanumeric characters that git must detect as moving
519+
alphanumeric characters that git must detect as moving/copying
520520
within a file for it to associate those lines with the parent
521-
commit.</p></div>
521+
commit. The default value is 20.</p></div>
522522
</dd>
523523
<dt>
524524
-C|&lt;num&gt;|
@@ -535,9 +535,11 @@ <h2 id="_options">OPTIONS</h2>
535535
looks for copies from other files in any commit.
536536
</p>
537537
<div class="para"><p>&lt;num&gt; is optional but it is the lower bound on the number of
538-
alphanumeric characters that git must detect as moving
538+
alphanumeric characters that git must detect as moving/copying
539539
between files for it to associate those lines with the parent
540-
commit.</p></div>
540+
commit. And the default value is 40. If there are more than one
541+
<tt>-C</tt> options given, the &lt;num&gt; argument of the last <tt>-C</tt> will
542+
take effect.</p></div>
541543
</dd>
542544
<dt>
543545
-h
@@ -860,7 +862,7 @@ <h2 id="_git">GIT</h2>
860862
</div>
861863
<div id="footer">
862864
<div id="footer-text">
863-
Last updated 2010-04-24 02:55:47 UTC
865+
Last updated 2010-05-21 14:57:14 UTC
864866
</div>
865867
</div>
866868
</body>

‎git-checkout.html‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ <h2>SYNOPSIS</h2>
322322
<div class="sectionbody">
323323
<div class="verseblock">
324324
<div class="content"><em>git checkout</em> [-q] [-f] [-m] [&lt;branch&gt;]
325-
<em>git checkout</em> [-q] [-f] [-m] [-b &lt;new_branch&gt;] [&lt;start_point&gt;]
325+
<em>git checkout</em> [-q] [-f] [-m] [[-b|--orphan] &lt;new_branch&gt;] [&lt;start_point&gt;]
326326
<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=&lt;style&gt;] [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;
327327
<em>git checkout</em> --patch [&lt;tree-ish&gt;] [--] [&lt;paths&gt;&#8230;]</div></div>
328328
</div>
@@ -442,6 +442,27 @@ <h2 id="_options">OPTIONS</h2>
442442
</p>
443443
</dd>
444444
<dt>
445+
--orphan
446+
</dt>
447+
<dd>
448+
<p>
449+
Create a new branch named &lt;new_branch&gt;, unparented to any other
450+
branch. The new branch you switch to does not have any commit
451+
and after the first one it will become the root of a new history
452+
completely unconnected from all the other branches.
453+
</p>
454+
<div class="para"><p>When you use "--orphan", the index and the working tree are kept intact.
455+
This allows you to start a new history that records set of paths similar
456+
to that of the start-point commit, which is useful when you want to keep
457+
different branches for different audiences you are working to like when
458+
you have an open source and commercial versions of a software, for example.</p></div>
459+
<div class="para"><p>If you want to start a disconnected history that records set of paths
460+
totally different from the original branch, you may want to first clear
461+
the index and the working tree, by running "git rm -rf ." from the
462+
top-level of the working tree, before preparing your files (by copying
463+
from elsewhere, extracting a tarball, etc.) in the working tree.</p></div>
464+
</dd>
465+
<dt>
445466
-m
446467
</dt>
447468
<dt>
@@ -675,7 +696,7 @@ <h2 id="_git">GIT</h2>
675696
</div>
676697
<div id="footer">
677698
<div id="footer-text">
678-
Last updated 2010-04-24 02:55:48 UTC
699+
Last updated 2010-05-21 14:57:15 UTC
679700
</div>
680701
</div>
681702
</body>

‎git-checkout.txt‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SYNOPSIS
99
--------
1010
[verse]
1111
'git checkout' [-q] [-f] [-m] [<branch>]
12-
'git checkout' [-q] [-f] [-m] [-b <new_branch>] [<start_point>]
12+
'git checkout' [-q] [-f] [-m] [[-b|--orphan] <new_branch>] [<start_point>]
1313
'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
1414
'git checkout' --patch [<tree-ish>] [--] [<paths>...]
1515

@@ -90,6 +90,24 @@ explicitly give a name with '-b' in such a case.
9090
Create the new branch's reflog; see linkgit:git-branch[1] for
9191
details.
9292

93+
--orphan::
94+
Create a new branch named <new_branch>, unparented to any other
95+
branch. The new branch you switch to does not have any commit
96+
and after the first one it will become the root of a new history
97+
completely unconnected from all the other branches.
98+
+
99+
When you use "--orphan", the index and the working tree are kept intact.
100+
This allows you to start a new history that records set of paths similar
101+
to that of the start-point commit, which is useful when you want to keep
102+
different branches for different audiences you are working to like when
103+
you have an open source and commercial versions of a software, for example.
104+
+
105+
If you want to start a disconnected history that records set of paths
106+
totally different from the original branch, you may want to first clear
107+
the index and the working tree, by running "git rm -rf ." from the
108+
top-level of the working tree, before preparing your files (by copying
109+
from elsewhere, extracting a tarball, etc.) in the working tree.
110+
93111
-m::
94112
--merge::
95113
When switching branches,

‎git-config.html‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2270,20 +2270,30 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
22702270
<dt>
22712271
gc.reflogexpire
22722272
</dt>
2273+
<dt>
2274+
gc.&lt;pattern&gt;.reflogexpire
2275+
</dt>
22732276
<dd>
22742277
<p>
22752278
<em>git reflog expire</em> removes reflog entries older than
2276-
this time; defaults to 90 days.
2279+
this time; defaults to 90 days. With "&lt;pattern&gt;" (e.g.
2280+
"refs/stash") in the middle the setting applies only to
2281+
the refs that match the &lt;pattern&gt;.
22772282
</p>
22782283
</dd>
22792284
<dt>
22802285
gc.reflogexpireunreachable
22812286
</dt>
2287+
<dt>
2288+
gc.&lt;ref&gt;.reflogexpireunreachable
2289+
</dt>
22822290
<dd>
22832291
<p>
22842292
<em>git reflog expire</em> removes reflog entries older than
22852293
this time and are not reachable from the current tip;
2286-
defaults to 30 days.
2294+
defaults to 30 days. With "&lt;pattern&gt;" (e.g. "refs/stash")
2295+
in the middle, the setting applies only to the refs that
2296+
match the &lt;pattern&gt;.
22872297
</p>
22882298
</dd>
22892299
<dt>
@@ -3553,7 +3563,9 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
35533563
<dd>
35543564
<p>
35553565
Setting this value to --no-tags disables automatic tag following when
3556-
fetching from remote &lt;name&gt;
3566+
fetching from remote &lt;name&gt;. Setting it to --tags will fetch every
3567+
tag from remote &lt;name&gt;, even if they are not reachable from remote
3568+
branch heads.
35573569
</p>
35583570
</dd>
35593571
<dt>
@@ -3892,7 +3904,7 @@ <h2 id="_git">GIT</h2>
38923904
</div>
38933905
<div id="footer">
38943906
<div id="footer-text">
3895-
Last updated 2010-05-19 08:13:29 UTC
3907+
Last updated 2010-05-21 14:57:15 UTC
38963908
</div>
38973909
</div>
38983910
</body>

0 commit comments

Comments
 (0)