Autogenerated HTML docs for v1.6.5-rc1 · fizx/git@7df6dcf · GitHub
Skip to content

Commit 7df6dcf

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.5-rc1
1 parent cf5b773 commit 7df6dcf

17 files changed

Lines changed: 730 additions & 17 deletions

‎RelNotes-1.6.4.3.txt‎

Lines changed: 29 additions & 0 deletions

‎RelNotes-1.6.5.txt‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ Updates since v1.6.4
3838

3939
* more improvements on mingw port.
4040

41+
* mingw will also give FRSX as the default value for the LESS
42+
environment variable when the user does not have one.
43+
4144
(performance)
4245

4346
* On major platforms, the system can be compiled to use with Linus's
@@ -48,11 +51,28 @@ Updates since v1.6.4
4851
* Unnecessary inefficiency in deepening of a shallow repository has
4952
been removed.
5053

54+
* The "git" main binary used to link with libcurl, which then dragged
55+
in a large number of external libraries. When using basic plumbing
56+
commands in scripts, this unnecessarily slowed things down. We now
57+
implement http/https/ftp transfer as a separate executable as we
58+
used to.
59+
60+
* "git clone" run locally hardlinks or copies the files in .git/ to
61+
newly created repository. It used to give new mtime to copied files,
62+
but this delayed garbage collection to trigger unnecessarily in the
63+
cloned repository. We now preserve mtime for these files to avoid
64+
this issue.
65+
5166
(usability, bells and whistles)
5267

5368
* Human writable date format to various options, e.g. --since=yesterday,
5469
master@{2000.09.17}, are taught to infer some omitted input properly.
5570

71+
* A few programs gave verbose "advice" messages to help uninitiated
72+
people when issuing error messages. An infrastructure to allow
73+
users to squelch them has been introduced, and a few such messages
74+
can be silenced now.
75+
5676
* refs/replace/ hierarchy is designed to be usable as a replacement
5777
of the "grafts" mechanism, with the added advantage that it can be
5878
transferred across repositories.
@@ -83,6 +103,8 @@ Updates since v1.6.4
83103
reordering commits and trees without touching the contents of
84104
blobs.
85105

106+
* "git fast-import" has a pair of new front-end in contrib/ area.
107+
86108
* "git init" learned to mkdir/chdir into a directory when given an
87109
extra argument (i.e. "git init this").
88110

@@ -91,8 +113,16 @@ Updates since v1.6.4
91113
* "git log --decorate" can optionally be told with --decorate=full to
92114
give the reference name in full.
93115

116+
* "git merge" issued an unnecessarily scary message when it detected
117+
that the merge may have to touch the path that the user has local
118+
uncommitted changes to. The message has been reworded to make it
119+
clear that the command aborted, without doing any harm.
120+
94121
* "git push" can be told to be --quiet.
95122

123+
* "git push" pays attention to url.$base.pushInsteadOf and uses a URL
124+
that is derived from the URL used for fetching.
125+
96126
* informational output from "git reset" that lists the locally modified
97127
paths is made consistent with that of "git checkout $another_branch".
98128

@@ -126,5 +156,6 @@ Fixes since v1.6.4
126156
--
127157
exec >/var/tmp/1
128158
O=v1.6.4.2-298-gdf01e7c
159+
O=v1.6.5-rc0-49-g5f2b1e6
129160
echo O=$(git describe master)
130161
git shortlog --no-merges $O..master --not maint

‎config.txt‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,21 @@ For command-specific variables, you will find a more detailed description
113113
in the appropriate manual page. You will find a description of non-core
114114
porcelain configuration variables in the respective porcelain documentation.
115115

116+
advice.*::
117+
When set to 'true', display the given optional help message.
118+
When set to 'false', do not display. The configuration variables
119+
are:
120+
+
121+
--
122+
pushNonFastForward::
123+
Advice shown when linkgit:git-push[1] refuses
124+
non-fast-forward refs. Default: true.
125+
statusHints::
126+
Directions on how to stage/unstage/add shown in the
127+
output of linkgit:git-status[1] and the template shown
128+
when writing commit messages. Default: true.
129+
--
130+
116131
core.fileMode::
117132
If false, the executable bit differences between the index and
118133
the working copy are ignored; useful on broken filesystems like FAT.
@@ -1500,6 +1515,19 @@ url.<base>.insteadOf::
15001515
never-before-seen repository on the site. When more than one
15011516
insteadOf strings match a given URL, the longest match is used.
15021517

1518+
url.<base>.pushInsteadOf::
1519+
Any URL that starts with this value will not be pushed to;
1520+
instead, it will be rewritten to start with <base>, and the
1521+
resulting URL will be pushed to. In cases where some site serves
1522+
a large number of repositories, and serves them with multiple
1523+
access methods, some of which do not allow push, this feature
1524+
allows people to specify a pull-only URL and have git
1525+
automatically use an appropriate URL to push, even for a
1526+
never-before-seen repository on the site. When more than one
1527+
pushInsteadOf strings match a given URL, the longest match is
1528+
used. If a remote has an explicit pushurl, git will ignore this
1529+
setting for that remote.
1530+
15031531
user.email::
15041532
Your email address to be recorded in any newly created commits.
15051533
Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and

‎git-add.html‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -419,10 +419,17 @@ <h2 id="_options">OPTIONS</h2>
419419
</dt>
420420
<dd>
421421
<p>
422-
Similar to Interactive mode but the initial command loop is
423-
bypassed and the <em>patch</em> subcommand is invoked using each of
424-
the specified filepatterns before exiting.
422+
Interactively choose hunks of patch between the index and the
423+
work tree and add them to the index. This gives the user a chance
424+
to review the difference before adding modified contents to the
425+
index.
425426
</p>
427+
<div class="literalblock">
428+
<div class="content">
429+
<pre><tt>This effectively runs ``add --interactive``, but bypasses the
430+
initial command menu and directly jumps to `patch` subcommand.
431+
See ``Interactive mode'' for details.</tt></pre>
432+
</div></div>
426433
</dd>
427434
<dt>
428435
-e, --edit
@@ -710,7 +717,7 @@ <h2 id="_git">GIT</h2>
710717
</div>
711718
<div id="footer">
712719
<div id="footer-text">
713-
Last updated 2009-08-13 01:22:24 UTC
720+
Last updated 2009-09-13 09:50:53 UTC
714721
</div>
715722
</div>
716723
</body>

‎git-add.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,14 @@ OPTIONS
7272

7373
-p::
7474
--patch::
75-
Similar to Interactive mode but the initial command loop is
76-
bypassed and the 'patch' subcommand is invoked using each of
77-
the specified filepatterns before exiting.
75+
Interactively choose hunks of patch between the index and the
76+
work tree and add them to the index. This gives the user a chance
77+
to review the difference before adding modified contents to the
78+
index.
79+
80+
This effectively runs ``add --interactive``, but bypasses the
81+
initial command menu and directly jumps to `patch` subcommand.
82+
See ``Interactive mode'' for details.
7883

7984
-e, \--edit::
8085
Open the diff vs. the index in an editor and let the user

‎git-clone.html‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,6 +697,22 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
697697
</div></div>
698698
<div class="para"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be
699699
rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p></div>
700+
<div class="para"><p>If you want to rewrite URLs for push only, you can create a
701+
configuration section of the form:</p></div>
702+
<div class="listingblock">
703+
<div class="content">
704+
<pre><tt> [url "&lt;actual url base&gt;"]
705+
pushInsteadOf = &lt;other url base&gt;</tt></pre>
706+
</div></div>
707+
<div class="para"><p>For example, with this:</p></div>
708+
<div class="listingblock">
709+
<div class="content">
710+
<pre><tt> [url "ssh://example.org/"]
711+
pushInsteadOf = git://example.org/</tt></pre>
712+
</div></div>
713+
<div class="para"><p>a URL like "git://example.org/path/to/repo.git" will be rewritten to
714+
"ssh://example.org/path/to/repo.git" for pushes, but pulls will still
715+
use the original URL.</p></div>
700716
</div>
701717
<h2 id="_examples">Examples</h2>
702718
<div class="sectionbody">
@@ -770,7 +786,7 @@ <h2 id="_git">GIT</h2>
770786
</div>
771787
<div id="footer">
772788
<div id="footer-text">
773-
Last updated 2009-09-08 00:55:00 UTC
789+
Last updated 2009-09-13 09:50:53 UTC
774790
</div>
775791
</div>
776792
</body>

‎git-config.html‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,6 +877,37 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
877877
porcelain configuration variables in the respective porcelain documentation.</p></div>
878878
<div class="vlist"><dl>
879879
<dt>
880+
advice.*
881+
</dt>
882+
<dd>
883+
<p>
884+
When set to <em>true</em>, display the given optional help message.
885+
When set to <em>false</em>, do not display. The configuration variables
886+
are:
887+
</p>
888+
<div class="vlist"><dl>
889+
<dt>
890+
pushNonFastForward
891+
</dt>
892+
<dd>
893+
<p>
894+
Advice shown when <a href="git-push.html">git-push(1)</a> refuses
895+
non-fast-forward refs. Default: true.
896+
</p>
897+
</dd>
898+
<dt>
899+
statusHints
900+
</dt>
901+
<dd>
902+
<p>
903+
Directions on how to stage/unstage/add shown in the
904+
output of <a href="git-status.html">git-status(1)</a> and the template shown
905+
when writing commit messages. Default: true.
906+
</p>
907+
</dd>
908+
</dl></div>
909+
</dd>
910+
<dt>
880911
core.fileMode
881912
</dt>
882913
<dd>
@@ -3426,6 +3457,24 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
34263457
</p>
34273458
</dd>
34283459
<dt>
3460+
url.&lt;base&gt;.pushInsteadOf
3461+
</dt>
3462+
<dd>
3463+
<p>
3464+
Any URL that starts with this value will not be pushed to;
3465+
instead, it will be rewritten to start with &lt;base&gt;, and the
3466+
resulting URL will be pushed to. In cases where some site serves
3467+
a large number of repositories, and serves them with multiple
3468+
access methods, some of which do not allow push, this feature
3469+
allows people to specify a pull-only URL and have git
3470+
automatically use an appropriate URL to push, even for a
3471+
never-before-seen repository on the site. When more than one
3472+
pushInsteadOf strings match a given URL, the longest match is
3473+
used. If a remote has an explicit pushurl, git will ignore this
3474+
setting for that remote.
3475+
</p>
3476+
</dd>
3477+
<dt>
34293478
user.email
34303479
</dt>
34313480
<dd>
@@ -3483,7 +3532,7 @@ <h2 id="_git">GIT</h2>
34833532
</div>
34843533
<div id="footer">
34853534
<div id="footer-text">
3486-
Last updated 2009-08-22 05:10:26 UTC
3535+
Last updated 2009-09-13 09:50:53 UTC
34873536
</div>
34883537
</div>
34893538
</body>

‎git-fetch.html‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,22 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
685685
</div></div>
686686
<div class="para"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be
687687
rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p></div>
688+
<div class="para"><p>If you want to rewrite URLs for push only, you can create a
689+
configuration section of the form:</p></div>
690+
<div class="listingblock">
691+
<div class="content">
692+
<pre><tt> [url "&lt;actual url base&gt;"]
693+
pushInsteadOf = &lt;other url base&gt;</tt></pre>
694+
</div></div>
695+
<div class="para"><p>For example, with this:</p></div>
696+
<div class="listingblock">
697+
<div class="content">
698+
<pre><tt> [url "ssh://example.org/"]
699+
pushInsteadOf = git://example.org/</tt></pre>
700+
</div></div>
701+
<div class="para"><p>a URL like "git://example.org/path/to/repo.git" will be rewritten to
702+
"ssh://example.org/path/to/repo.git" for pushes, but pulls will still
703+
use the original URL.</p></div>
688704
</div>
689705
<h2 id="_remotes_a_id_remotes_a">REMOTES<a id="REMOTES"></a></h2>
690706
<div class="sectionbody">
@@ -789,7 +805,7 @@ <h2 id="_git">GIT</h2>
789805
</div>
790806
<div id="footer">
791807
<div id="footer-text">
792-
Last updated 2009-09-08 00:54:59 UTC
808+
Last updated 2009-09-13 09:50:53 UTC
793809
</div>
794810
</div>
795811
</body>

‎git-pull.html‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,22 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
839839
</div></div>
840840
<div class="para"><p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be
841841
rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p></div>
842+
<div class="para"><p>If you want to rewrite URLs for push only, you can create a
843+
configuration section of the form:</p></div>
844+
<div class="listingblock">
845+
<div class="content">
846+
<pre><tt> [url "&lt;actual url base&gt;"]
847+
pushInsteadOf = &lt;other url base&gt;</tt></pre>
848+
</div></div>
849+
<div class="para"><p>For example, with this:</p></div>
850+
<div class="listingblock">
851+
<div class="content">
852+
<pre><tt> [url "ssh://example.org/"]
853+
pushInsteadOf = git://example.org/</tt></pre>
854+
</div></div>
855+
<div class="para"><p>a URL like "git://example.org/path/to/repo.git" will be rewritten to
856+
"ssh://example.org/path/to/repo.git" for pushes, but pulls will still
857+
use the original URL.</p></div>
842858
</div>
843859
<h2 id="_remotes_a_id_remotes_a">REMOTES<a id="REMOTES"></a></h2>
844860
<div class="sectionbody">
@@ -1157,7 +1173,7 @@ <h2 id="_git">GIT</h2>
11571173
</div>
11581174
<div id="footer">
11591175
<div id="footer-text">
1160-
Last updated 2009-09-08 00:55:00 UTC
1176+
Last updated 2009-09-13 09:50:53 UTC
11611177
</div>
11621178
</div>
11631179
</body>

‎git-push.html‎

Lines changed: 17 additions & 1 deletion

0 commit comments

Comments
 (0)