Skip to content

Commit a476efa

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.0.2-514-g23abd3
1 parent 7cc9129 commit a476efa

42 files changed

Lines changed: 865 additions & 459 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎RelNotes-1.6.0.3.txt‎

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,83 @@ Fixes since v1.6.0.2
1313
* Continuing "git rebase -i" was also very confused when the user left
1414
some staged changes in the index after "edit".
1515

16+
* "git rebase -i" now honors the pre-rebase hook, just like the
17+
other rebase implementations "git rebase" and "git rebase -m".
18+
1619
* Behaviour of "git diff --quiet" was inconsistent with "diff --exit-code"
1720
with the output redirected to /dev/null.
1821

22+
* "git diff --no-index" on binary files no longer outputs a bogus
23+
"diff --git" header line.
24+
25+
* Hunk headers in "git diff" default to using extended regular
26+
expressions, fixing some of the internal patterns on non-GNU
27+
platforms.
28+
29+
* New config "diff.*.xfuncname" exposes extended regular expressions
30+
for user specified hunk header patterns.
31+
32+
* "git stash apply sash@{1}" was fixed to error out. Prior versions
33+
would have applied stash@{0} incorrectly.
34+
35+
* "git stash apply" now offers a better suggestion on how to continue
36+
if the working tree is currently dirty.
37+
38+
* "git for-each-ref --format=%(subject)" fixed for commits with no
39+
no newline in the message body.
40+
41+
* "git remote" fixed to protect printf from user input.
42+
43+
* "git remote show -v" now displays all URLs of a remote.
44+
45+
* "git checkout -q" once again suppresses the locally modified file list.
46+
47+
* "git clone -q", "git fetch -q" asks remote side to not send
48+
progress messages, actually making their output quiet.
49+
50+
* Cross-directory renames are no longer used when creating packs. This
51+
allows more graceful behavior on filesystems like sshfs.
52+
53+
* Stale temporary files under $GIT_DIR/objects/pack are now cleaned up
54+
automatically by "git prune".
55+
56+
* "git merge" once again removes directories after the last file has
57+
been removed from it during the merge.
58+
59+
* "git blame -C -C" no longer segfaults while trying to pass blame if
60+
it encounters a submodule reference.
61+
62+
* "git svn" fixed to display an error message when 'set-tree' failed,
63+
instead of a Perl compile error.
64+
65+
* "git submodule" fixed to handle checking out a different commit
66+
than HEAD after initializing the submodule.
67+
68+
* The "git commit" error message when there are still unmerged
69+
files present was clarified to match "git write-tree".
70+
71+
* Some segfaults due to uncaught NULL pointers were fixed in multiple
72+
tools such as apply, reset, update-index.
73+
74+
* Solaris builds now default to OLD_ICONV=1 to avoid compile warnings.
75+
1976
* "Git.pm" tests relied on unnecessarily more recent version of Perl.
2077

2178
* "gitweb" triggered undef warning on commits without log messages.
2279

80+
* "gitweb" triggered undef warnings on missing trees.
81+
82+
* "gitweb" now removes PATH_INFO from its URLs so users don't have
83+
to manually set the URL in the gitweb configuration.
84+
85+
* Bash completion removed support for legacy "git-fetch", "git-push"
86+
and "git-pull" as these are no longer installed. Dashless form
87+
("git fetch") is still however supported.
88+
2389
Many other documentation updates.
2490

2591
--
2692
exec >/var/tmp/1
27-
O=v1.6.0.2-32-g8d11fde
93+
O=v1.6.0.2-76-gd70b4a8
2894
echo O=$(git describe maint)
2995
git shortlog --no-merges $O..maint

‎RelNotes-1.6.1.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ on.
5959

6060
* "git daemon" learned --max-connections=<count> option.
6161

62-
* "git diff" learned to mimick --suppress-blank-empty from GNU diff via a
62+
* "git diff" learned to mimic --suppress-blank-empty from GNU diff via a
6363
configuration option.
6464

6565
* "git diff" learned to put more sensible hunk headers for Python and
@@ -121,7 +121,7 @@ release, unless otherwise noted.
121121
is a path in it).
122122

123123
* "git diff --stdin" used to take two trees on a line and compared them,
124-
but we droppped support for such a use case long time ago. This has
124+
but we dropped support for such a use case long time ago. This has
125125
been resurrected.
126126

127127
* "git filter-branch" failed to rewrite a tag name with slashes in it.

‎config.txt‎

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,15 @@ core.fileMode::
117117
the working copy are ignored; useful on broken filesystems like FAT.
118118
See linkgit:git-update-index[1]. True by default.
119119

120+
core.ignoreCygwinFSTricks::
121+
This option is only used by Cygwin implementation of Git. If false,
122+
the Cygwin stat() and lstat() functions are used. This may be useful
123+
if your repository consists of a few separate directories joined in
124+
one hierarchy using Cygwin mount. If true, Git uses native Win32 API
125+
whenever it is possible and falls back to Cygwin functions only to
126+
handle symbol links. The native mode is more than twice faster than
127+
normal Cygwin l/stat() functions. True by default.
128+
120129
core.trustctime::
121130
If false, the ctime differences between the index and the
122131
working copy are ignored; useful when the inode change time
@@ -363,8 +372,17 @@ core.pager::
363372
variable. Note that git sets the `LESS` environment
364373
variable to `FRSX` if it is unset when it runs the
365374
pager. One can change these settings by setting the
366-
`LESS` variable to some other value or by giving the
367-
`core.pager` option a value such as "`less -+FRSX`".
375+
`LESS` variable to some other value. Alternately,
376+
these settings can be overridden on a project or
377+
global basis by setting the `core.pager` option.
378+
Setting `core.pager` has no affect on the `LESS`
379+
environment variable behaviour above, so if you want
380+
to override git's default settings this way, you need
381+
to be explicit. For example, to disable the S option
382+
in a backward compatible manner, set `core.pager`
383+
to "`less -+$LESS -FRX`". This will be passed to the
384+
shell by git, which will translate the final command to
385+
"`LESS=FRSX less -+FRSX -FRX`".
368386

369387
core.whitespace::
370388
A comma separated list of common whitespace problems to
@@ -918,6 +936,14 @@ man.<tool>.path::
918936
Override the path for the given tool that may be used to
919937
display help in the 'man' format. See linkgit:git-help[1].
920938

939+
merge.conflictstyle::
940+
Specify the style in which conflicted hunks are written out to
941+
working tree files upon merge. The default is "merge", which
942+
shows `<<<<<<<` conflict marker, change made by one side,
943+
`=======` marker, change made by the other side, and then
944+
`>>>>>>>` marker. An alternate style, "diff3", adds `|||||||`
945+
marker and the original text before `=======` marker.
946+
921947
mergetool.<tool>.path::
922948
Override the path for the given tool. This is useful in case
923949
your tool is not in the PATH.

‎diff-options.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ endif::git-format-patch[]
6565
can be set with "--dirstat=limit". Changes in a child directory is not
6666
counted for the parent directory, unless "--cumulative" is used.
6767

68+
--dirstat-by-file[=limit]::
69+
Same as --dirstat, but counts changed files instead of lines.
70+
6871
--summary::
6972
Output a condensed summary of extended header information
7073
such as creations, renames and mode changes.

‎git-apply.html‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,8 @@ <h2>SYNOPSIS</h2>
326326
[--allow-binary-replacement | --binary] [--reject] [-z]
327327
[-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
328328
[--whitespace=&lt;nowarn|warn|fix|error|error-all&gt;]
329-
[--exclude=PATH] [--directory=&lt;root&gt;] [--verbose] [&lt;patch&gt;&#8230;]</div></div>
329+
[--exclude=PATH] [--include=PATH] [--directory=&lt;root&gt;]
330+
[--verbose] [&lt;patch&gt;&#8230;]</div></div>
330331
</div>
331332
<h2 id="_description">DESCRIPTION</h2>
332333
<div class="sectionbody">
@@ -543,6 +544,21 @@ <h2 id="_options">OPTIONS</h2>
543544
</p>
544545
</dd>
545546
<dt>
547+
--include=&lt;path-pattern&gt;
548+
</dt>
549+
<dd>
550+
<p>
551+
Apply changes to files matching the given path pattern. This can
552+
be useful when importing patchsets, where you want to include certain
553+
files or directories.
554+
</p>
555+
<div class="para"><p>When --exclude and --include patterns are used, they are examined in the
556+
order they appear on the command line, and the first match determines if a
557+
patch to each path is used. A patch to a path that does not match any
558+
include/exclude pattern is used by default if there is no include pattern
559+
on the command line, and ignored if there is any include pattern.</p></div>
560+
</dd>
561+
<dt>
546562
--whitespace=&lt;action&gt;
547563
</dt>
548564
<dd>
@@ -683,7 +699,7 @@ <h2 id="_git">GIT</h2>
683699
</div>
684700
<div id="footer">
685701
<div id="footer-text">
686-
Last updated 2008-09-19 06:32:41 UTC
702+
Last updated 2008-10-10 15:30:41 UTC
687703
</div>
688704
</div>
689705
</body>

‎git-apply.txt‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ SYNOPSIS
1414
[--allow-binary-replacement | --binary] [--reject] [-z]
1515
[-pNUM] [-CNUM] [--inaccurate-eof] [--recount] [--cached]
1616
[--whitespace=<nowarn|warn|fix|error|error-all>]
17-
[--exclude=PATH] [--directory=<root>] [--verbose] [<patch>...]
17+
[--exclude=PATH] [--include=PATH] [--directory=<root>]
18+
[--verbose] [<patch>...]
1819

1920
DESCRIPTION
2021
-----------
@@ -137,6 +138,17 @@ discouraged.
137138
be useful when importing patchsets, where you want to exclude certain
138139
files or directories.
139140

141+
--include=<path-pattern>::
142+
Apply changes to files matching the given path pattern. This can
143+
be useful when importing patchsets, where you want to include certain
144+
files or directories.
145+
+
146+
When --exclude and --include patterns are used, they are examined in the
147+
order they appear on the command line, and the first match determines if a
148+
patch to each path is used. A patch to a path that does not match any
149+
include/exclude pattern is used by default if there is no include pattern
150+
on the command line, and ignored if there is any include pattern.
151+
140152
--whitespace=<action>::
141153
When applying a patch, detect a new or modified line that has
142154
whitespace errors. What are considered whitespace errors is

‎git-checkout.html‎

Lines changed: 47 additions & 8 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] [--track | --no-track] [-b &lt;new_branch&gt; [-l]] [-m] [&lt;branch&gt;]
325-
<em>git checkout</em> [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;</div></div>
325+
<em>git checkout</em> [-f|--ours|--theirs|-m|--conflict=&lt;style&gt;] [&lt;tree-ish&gt;] [--] &lt;paths&gt;&#8230;</div></div>
326326
</div>
327327
<h2 id="_description">DESCRIPTION</h2>
328328
<div class="sectionbody">
@@ -337,13 +337,19 @@ <h2 id="_description">DESCRIPTION</h2>
337337
the first namespace level.</p></div>
338338
<div class="para"><p>When &lt;paths&gt; are given, this command does <strong>not</strong> switch
339339
branches. It updates the named paths in the working tree from
340-
the index file (i.e. it runs <tt>git checkout-index -f -u</tt>), or
341-
from a named commit. In
342-
this case, the <tt>-f</tt> and <tt>-b</tt> options are meaningless and giving
340+
the index file, or from a named commit. In
341+
this case, the <tt>-b</tt> options is meaningless and giving
343342
either of them results in an error. &lt;tree-ish&gt; argument can be
344343
used to specify a specific tree-ish (i.e. commit, tag or tree)
345344
to update the index for the given paths before updating the
346345
working tree.</p></div>
346+
<div class="para"><p>The index may contain unmerged entries after a failed merge. By
347+
default, if you try to check out such an entry from the index, the
348+
checkout operation will fail and nothing will be checked out.
349+
Using -f will ignore these unmerged entries. The contents from a
350+
specific side of the merge can be checked out of the index by
351+
using --ours or --theirs. With -m, changes made to the working tree
352+
file can be discarded to recreate the original conflicted merge result.</p></div>
347353
</div>
348354
<h2 id="_options">OPTIONS</h2>
349355
<div class="sectionbody">
@@ -361,8 +367,23 @@ <h2 id="_options">OPTIONS</h2>
361367
</dt>
362368
<dd>
363369
<p>
364-
Proceed even if the index or the working tree differs
365-
from HEAD. This is used to throw away local changes.
370+
When switching branches, proceed even if the index or the
371+
working tree differs from HEAD. This is used to throw away
372+
local changes.
373+
</p>
374+
<div class="para"><p>When checking out paths from the index, do not fail upon unmerged
375+
entries; instead, unmerged entries are ignored.</p></div>
376+
</dd>
377+
<dt>
378+
--ours
379+
</dt>
380+
<dt>
381+
--theirs
382+
</dt>
383+
<dd>
384+
<p>
385+
When checking out paths from the index, check out stage #2
386+
(<em>ours</em>) or #3 (<em>theirs</em>) for unmerged paths.
366387
</p>
367388
</dd>
368389
<dt>
@@ -427,9 +448,13 @@ <h2 id="_options">OPTIONS</h2>
427448
<dt>
428449
-m
429450
</dt>
451+
<dt>
452+
--merge
453+
</dt>
430454
<dd>
431455
<p>
432-
If you have local modifications to one or more files that
456+
When switching branches,
457+
if you have local modifications to one or more files that
433458
are different between the current branch and the branch to
434459
which you are switching, the command refuses to switch
435460
branches in order to preserve your modifications in context.
@@ -441,6 +466,20 @@ <h2 id="_options">OPTIONS</h2>
441466
paths are left unmerged, and you need to resolve the conflicts
442467
and mark the resolved paths with <tt>git add</tt> (or <tt>git rm</tt> if the merge
443468
should result in deletion of the path).</p></div>
469+
<div class="para"><p>When checking out paths from the index, this option lets you recreate
470+
the conflicted merge in the specified paths.</p></div>
471+
</dd>
472+
<dt>
473+
--conflict=&lt;style&gt;
474+
</dt>
475+
<dd>
476+
<p>
477+
The same as --merge option above, but changes the way the
478+
conflicting hunks are presented, overriding the
479+
merge.conflictstyle configuration variable. Possible values are
480+
"merge" (default) and "diff3" (in addition to what is shown by
481+
"merge" style, shows the original contents).
482+
</p>
444483
</dd>
445484
<dt>
446485
&lt;new_branch&gt;
@@ -603,7 +642,7 @@ <h2 id="_git">GIT</h2>
603642
</div>
604643
<div id="footer">
605644
<div id="footer-text">
606-
Last updated 2008-09-19 06:32:44 UTC
645+
Last updated 2008-10-10 15:30:41 UTC
607646
</div>
608647
</div>
609648
</body>

0 commit comments

Comments
 (0)