Skip to content

Commit 619596a

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.7.2.1-158-gbd3a97
1 parent b5a296f commit 619596a

40 files changed

+288
-78
lines changed

‎config.txt‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ advice.*::
128128
when writing commit messages. Default: true.
129129
commitBeforeMerge::
130130
Advice shown when linkgit:git-merge[1] refuses to
131-
merge to avoid overwritting local changes.
131+
merge to avoid overwriting local changes.
132132
Default: true.
133133
resolveConflict::
134134
Advices shown by various commands when conflicts
@@ -418,7 +418,7 @@ Common unit suffixes of 'k', 'm', or 'g' are supported.
418418

419419
core.deltaBaseCacheLimit::
420420
Maximum number of bytes to reserve for caching base objects
421-
that multiple deltafied objects reference. By storing the
421+
that may be referenced by multiple deltified objects. By storing the
422422
entire decompressed base objects in a cache Git is able
423423
to avoid unpacking and decompressing frequently used base
424424
objects multiple times.
@@ -563,7 +563,7 @@ not necessarily be the current directory.
563563
am.keepcr::
564564
If true, git-am will call git-mailsplit for patches in mbox format
565565
with parameter '--keep-cr'. In this case git-mailsplit will
566-
not remove `\r` from lines ending with `\r\n`. Can be overrriden
566+
not remove `\r` from lines ending with `\r\n`. Can be overridden
567567
by giving '--no-keep-cr' from the command line.
568568
See linkgit:git-am[1], linkgit:git-mailsplit[1].
569569

@@ -826,6 +826,11 @@ diff.renames::
826826
will enable basic rename detection. If set to "copies" or
827827
"copy", it will detect copies, as well.
828828

829+
diff.ignoreSubmodules::
830+
Sets the default value of --ignore-submodules. Note that this
831+
affects only 'git diff' Porcelain, and not lower level 'diff'
832+
commands such as 'git diff-files'.
833+
829834
diff.suppressBlankEmpty::
830835
A boolean to inhibit the standard behavior of printing a space
831836
before each empty output line. Defaults to false.
@@ -1002,7 +1007,7 @@ gitcvs.usecrlfattr::
10021007
If true, the server will look up the end-of-line conversion
10031008
attributes for files to determine the '-k' modes to use. If
10041009
the attributes force git to treat a file as text,
1005-
the '-k' mode will be left blank so cvs clients will
1010+
the '-k' mode will be left blank so CVS clients will
10061011
treat it as text. If they suppress text conversion, the file
10071012
will be set with '-kb' mode, which suppresses any newline munging
10081013
the client might otherwise do. If the attributes do not allow
@@ -1275,7 +1280,9 @@ instaweb.local::
12751280
be bound to the local IP (127.0.0.1).
12761281

12771282
instaweb.modulepath::
1278-
The module path for an apache httpd used by linkgit:git-instaweb[1].
1283+
The default module path for linkgit:git-instaweb[1] to use
1284+
instead of /usr/lib/apache2/modules. Only used if httpd
1285+
is Apache.
12791286

12801287
instaweb.port::
12811288
The port number to bind the gitweb httpd to. See
@@ -1747,6 +1754,19 @@ submodule.<name>.update::
17471754
URL and other values found in the `.gitmodules` file. See
17481755
linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
17491756

1757+
submodule.<name>.ignore::
1758+
Defines under what circumstances "git status" and the diff family show
1759+
a submodule as modified. When set to "all", it will never be considered
1760+
modified, "dirty" will ignore all changes to the submodules work tree and
1761+
takes only differences between the HEAD of the submodule and the commit
1762+
recorded in the superproject into account. "untracked" will additionally
1763+
let submodules with modified tracked files in their work tree show up.
1764+
Using "none" (the default when this option is not set) also shows
1765+
submodules that have untracked files in their work tree as changed.
1766+
This setting overrides any setting made in .gitmodules for this submodule,
1767+
both settings can be overriden on the command line by using the
1768+
"--ignore-submodules" option.
1769+
17501770
tar.umask::
17511771
This variable can be used to restrict the permission bits of
17521772
tar archive entries. The default is 0002, which turns off the

‎diff-options.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,11 @@ endif::git-format-patch[]
355355

356356
--ignore-submodules[=<when>]::
357357
Ignore changes to submodules in the diff generation. <when> can be
358-
either "untracked", "dirty" or "all", which is the default. When
358+
either "none", "untracked", "dirty" or "all", which is the default
359+
Using "none" will consider the submodule modified when it either contains
360+
untracked or modified files or its HEAD differs from the commit recorded
361+
in the superproject and can be used to override any settings of the
362+
'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When
359363
"untracked" is used submodules are not considered dirty when they only
360364
contain untracked content (but they are still scanned for modified
361365
content). Using "dirty" ignores all changes to the work tree of submodules,

‎git-bisect-lk2009.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ <h3 id="_following_general_best_practices">Following general best practices</h3>
11041104
<div class="para"><p>The smaller the changes in your commit, the most effective "git
11051105
bisect" will be. And you will probably need "git bisect" less in the
11061106
first place, as small changes are easier to review even if they are
1107-
only reviewed by the commiter.</p></div>
1107+
only reviewed by the committer.</p></div>
11081108
<div class="para"><p>Another good idea is to have good commit messages. They can be very
11091109
helpful to understand why some changes were made.</p></div>
11101110
<div class="para"><p>These general best practices are very helpful if you bisect often.</p></div>
@@ -1472,7 +1472,7 @@ <h2 id="_references">References</h2>
14721472
</div>
14731473
<div id="footer">
14741474
<div id="footer-text">
1475-
Last updated 2010-07-21 21:55:45 UTC
1475+
Last updated 2010-08-18 22:14:55 UTC
14761476
</div>
14771477
</div>
14781478
</body>

‎git-bisect-lk2009.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ logical change in each commit.
971971
The smaller the changes in your commit, the most effective "git
972972
bisect" will be. And you will probably need "git bisect" less in the
973973
first place, as small changes are easier to review even if they are
974-
only reviewed by the commiter.
974+
only reviewed by the committer.
975975

976976
Another good idea is to have good commit messages. They can be very
977977
helpful to understand why some changes were made.

‎git-checkout.html‎

Lines changed: 23 additions & 3 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|--orphan] &lt;new_branch&gt;] [&lt;start_point&gt;]
325+
<em>git checkout</em> [-q] [-f] [-m] [[-b|-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>
@@ -337,7 +337,7 @@ <h2 id="_description">DESCRIPTION</h2>
337337
<em>git checkout</em> [&lt;branch&gt;]
338338
</dt>
339339
<dt>
340-
<em>git checkout</em> -b &lt;new branch&gt; [&lt;start point&gt;]
340+
<em>git checkout</em> -b|-B &lt;new_branch&gt; [&lt;start point&gt;]
341341
</dt>
342342
<dd>
343343
<p>
@@ -349,6 +349,15 @@ <h2 id="_description">DESCRIPTION</h2>
349349
use the <tt>--track</tt> or <tt>--no-track</tt> options, which will be passed to
350350
<em>git branch</em>. As a convenience, <tt>--track</tt> without <tt>-b</tt> implies branch
351351
creation; see the description of <tt>--track</tt> below.</p></div>
352+
<div class="para"><p>If <tt>-B</tt> is given, &lt;new_branch&gt; is created if it doesn't exist; otherwise, it
353+
is reset. This is the transactional equivalent of</p></div>
354+
<div class="listingblock">
355+
<div class="content">
356+
<pre><tt>$ git branch -f &lt;branch&gt; [&lt;start point&gt;]
357+
$ git checkout &lt;branch&gt;</tt></pre>
358+
</div></div>
359+
<div class="para"><p>that is to say, the branch is not reset/created unless "git checkout" is
360+
successful.</p></div>
352361
</dd>
353362
<dt>
354363
<em>git checkout</em> [--patch] [&lt;tree-ish&gt;] [--] &lt;pathspec&gt;&#8230;
@@ -425,6 +434,17 @@ <h2 id="_options">OPTIONS</h2>
425434
</p>
426435
</dd>
427436
<dt>
437+
-B
438+
</dt>
439+
<dd>
440+
<p>
441+
Creates the branch &lt;new_branch&gt; and start it at &lt;start_point&gt;;
442+
if it already exists, then reset it to &lt;start_point&gt;. This is
443+
equivalent to running "git branch" with "-f"; see
444+
<a href="git-branch.html">git-branch(1)</a> for details.
445+
</p>
446+
</dd>
447+
<dt>
428448
-t
429449
</dt>
430450
<dt>
@@ -727,7 +747,7 @@ <h2 id="_git">GIT</h2>
727747
</div>
728748
<div id="footer">
729749
<div id="footer-text">
730-
Last updated 2010-07-21 21:55:16 UTC
750+
Last updated 2010-08-18 22:14:47 UTC
731751
</div>
732752
</div>
733753
</body>

‎git-checkout.txt‎

Lines changed: 19 additions & 2 deletions
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|--orphan] <new_branch>] [<start_point>]
12+
'git checkout' [-q] [-f] [-m] [[-b|-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

@@ -21,7 +21,7 @@ also update `HEAD` to set the specified branch as the current
2121
branch.
2222

2323
'git checkout' [<branch>]::
24-
'git checkout' -b <new branch> [<start point>]::
24+
'git checkout' -b|-B <new_branch> [<start point>]::
2525

2626
This form switches branches by updating the index, working
2727
tree, and HEAD to reflect the specified branch.
@@ -31,6 +31,17 @@ were called and then checked out; in this case you can
3131
use the `--track` or `--no-track` options, which will be passed to
3232
'git branch'. As a convenience, `--track` without `-b` implies branch
3333
creation; see the description of `--track` below.
34+
+
35+
If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it
36+
is reset. This is the transactional equivalent of
37+
+
38+
------------
39+
$ git branch -f <branch> [<start point>]
40+
$ git checkout <branch>
41+
------------
42+
+
43+
that is to say, the branch is not reset/created unless "git checkout" is
44+
successful.
3445

3546
'git checkout' [--patch] [<tree-ish>] [--] <pathspec>...::
3647

@@ -75,6 +86,12 @@ entries; instead, unmerged entries are ignored.
7586
Create a new branch named <new_branch> and start it at
7687
<start_point>; see linkgit:git-branch[1] for details.
7788

89+
-B::
90+
Creates the branch <new_branch> and start it at <start_point>;
91+
if it already exists, then reset it to <start_point>. This is
92+
equivalent to running "git branch" with "-f"; see
93+
linkgit:git-branch[1] for details.
94+
7895
-t::
7996
--track::
8097
When creating a new branch, set up "upstream" configuration. See

‎git-clean.html‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ <h2>NAME</h2>
321321
<h2>SYNOPSIS</h2>
322322
<div class="sectionbody">
323323
<div class="verseblock">
324-
<div class="content"><em>git clean</em> [-d] [-f] [-n] [-q] [-x | -X] [--] &lt;path&gt;&#8230;</div></div>
324+
<div class="content"><em>git clean</em> [-d] [-f] [-n] [-q] [-e &lt;pattern&gt;] [-x | -X] [--] &lt;path&gt;&#8230;</div></div>
325325
</div>
326326
<h2 id="_description">DESCRIPTION</h2>
327327
<div class="sectionbody">
@@ -383,6 +383,19 @@ <h2 id="_options">OPTIONS</h2>
383383
</p>
384384
</dd>
385385
<dt>
386+
-e &lt;pattern&gt;
387+
</dt>
388+
<dt>
389+
--exclude=&lt;pattern&gt;
390+
</dt>
391+
<dd>
392+
<p>
393+
Specify special exceptions to not be cleaned. Each &lt;pattern&gt; is
394+
the same form as in $GIT_DIR/info/excludes and this option can be
395+
given multiple times.
396+
</p>
397+
</dd>
398+
<dt>
386399
-x
387400
</dt>
388401
<dd>
@@ -414,7 +427,7 @@ <h2 id="_git">GIT</h2>
414427
</div>
415428
<div id="footer">
416429
<div id="footer-text">
417-
Last updated 2010-07-21 21:55:17 UTC
430+
Last updated 2010-08-18 22:14:47 UTC
418431
</div>
419432
</div>
420433
</body>

‎git-clean.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree
88
SYNOPSIS
99
--------
1010
[verse]
11-
'git clean' [-d] [-f] [-n] [-q] [-x | -X] [--] <path>...
11+
'git clean' [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...
1212

1313
DESCRIPTION
1414
-----------
@@ -45,6 +45,12 @@ OPTIONS
4545
Be quiet, only report errors, but not the files that are
4646
successfully removed.
4747

48+
-e <pattern>::
49+
--exclude=<pattern>::
50+
Specify special exceptions to not be cleaned. Each <pattern> is
51+
the same form as in $GIT_DIR/info/excludes and this option can be
52+
given multiple times.
53+
4854
-x::
4955
Don't use the ignore rules. This allows removing all untracked
5056
files, including build products. This can be used (possibly in

‎git-clone.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
655655
</p>
656656
</li>
657657
</ul></div>
658-
<div class="para"><p>For local respositories, also supported by git natively, the following
658+
<div class="para"><p>For local repositories, also supported by git natively, the following
659659
syntaxes may be used:</p></div>
660660
<div class="ilist"><ul>
661661
<li>
@@ -792,7 +792,7 @@ <h2 id="_git">GIT</h2>
792792
</div>
793793
<div id="footer">
794794
<div id="footer-text">
795-
Last updated 2010-07-21 21:55:17 UTC
795+
Last updated 2010-08-18 22:14:47 UTC
796796
</div>
797797
</div>
798798
</body>

‎git-commit.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ <h2 id="_options">OPTIONS</h2>
547547
Usually recording a commit that has the exact same tree as its
548548
sole parent commit is a mistake, and the command prevents you
549549
from making such a commit. This option bypasses the safety, and
550-
is primarily for use by foreign scm interface scripts.
550+
is primarily for use by foreign SCM interface scripts.
551551
</p>
552552
</dd>
553553
<dt>
@@ -556,7 +556,7 @@ <h2 id="_options">OPTIONS</h2>
556556
<dd>
557557
<p>
558558
Like --allow-empty this command is primarily for use by foreign
559-
scm interface scripts. It allows you to create a commit with an
559+
SCM interface scripts. It allows you to create a commit with an
560560
empty commit message without using plumbing commands like
561561
<a href="git-commit-tree.html">git-commit-tree(1)</a>.
562562
</p>
@@ -1006,7 +1006,7 @@ <h2 id="_git">GIT</h2>
10061006
</div>
10071007
<div id="footer">
10081008
<div id="footer-text">
1009-
Last updated 2010-07-21 21:55:18 UTC
1009+
Last updated 2010-08-18 22:14:47 UTC
10101010
</div>
10111011
</div>
10121012
</body>

0 commit comments

Comments
 (0)