Skip to content

Commit 167b138

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.7.0-rc1-7-gc0da5
1 parent 197c229 commit 167b138

29 files changed

Lines changed: 75 additions & 66 deletions

‎RelNotes-1.7.0.txt‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Notes on behaviour change
2525
configured that variable.
2626

2727
* "git status" is not "git commit --dry-run" anymore. This change does
28-
not affect you if you run the command without pathspec.
28+
not affect you if you run the command without argument.
2929

3030
* "git diff" traditionally treated various "ignore whitespace" options
3131
only as a way to filter the patch output. "git diff --exit-code -b"
@@ -38,6 +38,13 @@ Notes on behaviour change
3838
whitespaces is reported with zero exit status when run with
3939
--exit-code, and there is no "diff --git" header for such a change.
4040

41+
* external diff and textconv helpers are now executed using the shell.
42+
This makes them consistent with other programs executed by git, and
43+
allows you to pass command-line parameters to the helpers. Any helper
44+
paths containing spaces or other metacharacters now need to be
45+
shell-quoted. The affected helpers are GIT_EXTERNAL_DIFF in the
46+
environment, and diff.*.command and diff.*.textconv in the config
47+
file.
4148

4249
Updates since v1.6.6
4350
--------------------
@@ -175,6 +182,9 @@ Updates since v1.6.6
175182

176183
* Many more commands are now built-in.
177184

185+
* THREADED_DELTA_SEARCH is no more. If you build with threads, delta
186+
compression will always take advantage of it.
187+
178188
Fixes since v1.6.6
179189
------------------
180190

@@ -198,7 +208,6 @@ release, unless otherwise noted.
198208

199209
--
200210
exec >/var/tmp/1
201-
O=v1.7.0-rc0-48-gdace5dd
202-
O=v1.7.0-rc0-67-gb10b918
211+
O=v1.7.0-rc1-6-g2ee8c5b
203212
echo O=$(git describe master)
204213
git shortlog --no-merges $O..master ^maint

‎diff-format.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
1919
git-diff-files [<pattern>...]::
2020
compares the index and the files on the filesystem.
2121

22-
The "git-diff-tree" command begins its ouput by printing the hash of
22+
The "git-diff-tree" command begins its output by printing the hash of
2323
what is being compared. After that, all the commands print one output
2424
line per changed file.
2525

‎git-bisect-lk2009.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ <h3 id="_checking_merge_bases">Checking merge bases</h3><div style="clear:left">
966966
fixed in the "main" branch by commit "F"?</p></div>
967967
<div class="para"><p>The result of such a bisection would be that we would find that H is
968968
the first bad commit, when in fact it's B. So that would be wrong!</p></div>
969-
<div class="para"><p>And yes it's can happen in practice that people working on one branch
969+
<div class="para"><p>And yes it can happen in practice that people working on one branch
970970
are not aware that people working on another branch fixed a bug! It
971971
could also happen that F fixed more than one bug or that it is a
972972
revert of some big development effort that was not ready to be
@@ -1472,7 +1472,7 @@ <h2 id="_references">References</h2>
14721472
</div>
14731473
<div id="footer">
14741474
<div id="footer-text">
1475-
Last updated 2009-12-03 09:12:57 UTC
1475+
Last updated 2010-01-31 23:03:59 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
@@ -799,7 +799,7 @@ fixed in the "main" branch by commit "F"?
799799
The result of such a bisection would be that we would find that H is
800800
the first bad commit, when in fact it's B. So that would be wrong!
801801

802-
And yes it's can happen in practice that people working on one branch
802+
And yes it can happen in practice that people working on one branch
803803
are not aware that people working on another branch fixed a bug! It
804804
could also happen that F fixed more than one bug or that it is a
805805
revert of some big development effort that was not ready to be

‎git-diff-files.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ <h2 id="_raw_output_format">Raw output format</h2>
923923
</p>
924924
</dd>
925925
</dl></div>
926-
<div class="para"><p>The "git-diff-tree" command begins its ouput by printing the hash of
926+
<div class="para"><p>The "git-diff-tree" command begins its output by printing the hash of
927927
what is being compared. After that, all the commands print one output
928928
line per changed file.</p></div>
929929
<div class="para"><p>An output line is formatted this way:</p></div>
@@ -1428,7 +1428,7 @@ <h2 id="_git">GIT</h2>
14281428
</div>
14291429
<div id="footer">
14301430
<div id="footer-text">
1431-
Last updated 2010-01-21 17:44:26 UTC
1431+
Last updated 2010-01-31 23:03:53 UTC
14321432
</div>
14331433
</div>
14341434
</body>

‎git-diff-index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,7 @@ <h2 id="_raw_output_format">Raw output format</h2>
907907
</p>
908908
</dd>
909909
</dl></div>
910-
<div class="para"><p>The "git-diff-tree" command begins its ouput by printing the hash of
910+
<div class="para"><p>The "git-diff-tree" command begins its output by printing the hash of
911911
what is being compared. After that, all the commands print one output
912912
line per changed file.</p></div>
913913
<div class="para"><p>An output line is formatted this way:</p></div>
@@ -1506,7 +1506,7 @@ <h2 id="_git">GIT</h2>
15061506
</div>
15071507
<div id="footer">
15081508
<div id="footer-text">
1509-
Last updated 2010-01-21 17:44:26 UTC
1509+
Last updated 2010-01-31 23:03:53 UTC
15101510
</div>
15111511
</div>
15121512
</body>

‎git-diff-tree.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,7 +1548,7 @@ <h2 id="_raw_output_format">Raw output format</h2>
15481548
</p>
15491549
</dd>
15501550
</dl></div>
1551-
<div class="para"><p>The "git-diff-tree" command begins its ouput by printing the hash of
1551+
<div class="para"><p>The "git-diff-tree" command begins its output by printing the hash of
15521552
what is being compared. After that, all the commands print one output
15531553
line per changed file.</p></div>
15541554
<div class="para"><p>An output line is formatted this way:</p></div>
@@ -2053,7 +2053,7 @@ <h2 id="_git">GIT</h2>
20532053
</div>
20542054
<div id="footer">
20552055
<div id="footer-text">
2056-
Last updated 2010-01-23 03:02:27 UTC
2056+
Last updated 2010-01-31 23:03:54 UTC
20572057
</div>
20582058
</div>
20592059
</body>

‎git-diff.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ <h2 id="_raw_output_format">Raw output format</h2>
969969
</p>
970970
</dd>
971971
</dl></div>
972-
<div class="para"><p>The "git-diff-tree" command begins its ouput by printing the hash of
972+
<div class="para"><p>The "git-diff-tree" command begins its output by printing the hash of
973973
what is being compared. After that, all the commands print one output
974974
line per changed file.</p></div>
975975
<div class="para"><p>An output line is formatted this way:</p></div>
@@ -1635,7 +1635,7 @@ <h2 id="_git">GIT</h2>
16351635
</div>
16361636
<div id="footer">
16371637
<div id="footer-text">
1638-
Last updated 2010-01-21 00:41:38 UTC
1638+
Last updated 2010-01-31 23:03:54 UTC
16391639
</div>
16401640
</div>
16411641
</body>

‎git-fast-export.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ <h2 id="_options">OPTIONS</h2>
361361
</dt>
362362
<dd>
363363
<p>
364-
Specify how to handle tags whose tagged objectis filtered out.
364+
Specify how to handle tags whose tagged object is filtered out.
365365
Since revisions and files to export can be limited by path,
366366
tagged objects may be filtered completely.
367367
</p>
@@ -494,7 +494,7 @@ <h2 id="_git">GIT</h2>
494494
</div>
495495
<div id="footer">
496496
<div id="footer-text">
497-
Last updated 2010-01-21 17:44:27 UTC
497+
Last updated 2010-01-31 23:03:55 UTC
498498
</div>
499499
</div>
500500
</body>

‎git-fast-export.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ unsigned, with 'verbatim', they will be silently exported
3737
and with 'warn', they will be exported, but you will see a warning.
3838

3939
--tag-of-filtered-object=(abort|drop|rewrite)::
40-
Specify how to handle tags whose tagged objectis filtered out.
40+
Specify how to handle tags whose tagged object is filtered out.
4141
Since revisions and files to export can be limited by path,
4242
tagged objects may be filtered completely.
4343
+

0 commit comments

Comments
 (0)