Autogenerated HTML docs for v2.21.0-155-ge902e
diff --git a/RelNotes/2.22.0.txt b/RelNotes/2.22.0.txt
index 9e1f738..16d3110 100644
--- a/RelNotes/2.22.0.txt
+++ b/RelNotes/2.22.0.txt
@@ -68,6 +68,23 @@
improves the code base.
(merge a97d00799a jt/http-auth-proto-v2-fix later to maint).
+ * The include file compat/bswap.h has been updated so that it is safe
+ to (accidentally) include it more than once.
+ (merge 33aa579a55 jk/guard-bswap-header later to maint).
+
+ * The set of header files used by "make hdr-check" unconditionally
+ included sha256/gcrypt.h, even when it is not used, causing the
+ make target to fail. We now skip it when GCRYPT_SHA256 is not in
+ use.
+ (merge f23aa18e7f rj/hdr-check-gcrypt-fix later to maint).
+
+ * The Makefile uses 'find' utility to enumerate all the *.h header
+ files, which is expensive on platforms with slow filesystems; it
+ now optionally uses "ls-files" if working within a repository,
+ which is a trick similar to how all sources are enumerated to run
+ ETAGS on.
+ (merge 92b88eba9f js/find-lib-h-with-ls-files-when-possible later to maint).
+
* Code cleanup, docfix, build fix, etc.
(merge 11f470aee7 jc/test-yes-doc later to maint).
(merge 90503a240b js/doc-symref-in-proto-v1 later to maint).
@@ -77,3 +94,8 @@
(merge 1ede45e44b en/merge-options-doc later to maint).
(merge 3e14dd2c8e rd/doc-hook-used-in-sample later to maint).
(merge c271dc28fd nd/no-more-check-racy later to maint).
+ (merge e6e15194a8 yb/utf-16le-bom-spellfix later to maint).
+ (merge bb101aaf0c rd/attr.c-comment-typofix later to maint).
+ (merge 716a5af812 rd/gc-prune-doc-fix later to maint).
+ (merge 50b206371d js/untravis-windows later to maint).
+ (merge dbf47215e3 js/rebase-recreate-merge later to maint).
diff --git a/git-gc.html b/git-gc.html
index 1298cae..19bf9ee 100644
--- a/git-gc.html
+++ b/git-gc.html
@@ -830,7 +830,7 @@
<p>
Prune loose objects older than date (default is 2 weeks ago,
overridable by the config variable <code>gc.pruneExpire</code>).
- --prune=all prunes loose objects regardless of their age and
+ --prune=now prunes loose objects regardless of their age and
increases the risk of corruption if another process is writing to
the repository concurrently; see "NOTES" below. --prune is on by
default.
@@ -995,7 +995,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2019-01-18 15:15:21 PST
+ 2019-03-11 18:02:43 JST
</div>
</div>
</body>
diff --git a/git-gc.txt b/git-gc.txt
index a744249..a7c1b0f 100644
--- a/git-gc.txt
+++ b/git-gc.txt
@@ -76,7 +76,7 @@
--prune=<date>::
Prune loose objects older than date (default is 2 weeks ago,
overridable by the config variable `gc.pruneExpire`).
- --prune=all prunes loose objects regardless of their age and
+ --prune=now prunes loose objects regardless of their age and
increases the risk of corruption if another process is writing to
the repository concurrently; see "NOTES" below. --prune is on by
default.
diff --git a/git-rebase.html b/git-rebase.html
index c5c13df..a10d853 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1404,7 +1404,7 @@
</p>
<div class="paragraph"><p>By default, or when <code>no-rebase-cousins</code> was specified, commits which do not
have <code><upstream></code> as direct ancestor will keep their original branch point,
-i.e. commits that would be excluded by gitlink:git-log[1]'s
+i.e. commits that would be excluded by <a href="git-log.html">git-log(1)</a>'s
<code>--ancestry-path</code> option will keep their original ancestry by default. If
the <code>rebase-cousins</code> mode is turned on, such commits are instead rebased
onto <code><upstream></code> (or <code><onto></code>, if specified).</p></div>
@@ -2452,7 +2452,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2019-02-19 15:22:22 PST
+ 2019-03-11 18:02:43 JST
</div>
</div>
</body>
diff --git a/git-rebase.txt b/git-rebase.txt
index 5629ba4..6363d67 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -410,7 +410,7 @@
+
By default, or when `no-rebase-cousins` was specified, commits which do not
have `<upstream>` as direct ancestor will keep their original branch point,
-i.e. commits that would be excluded by gitlink:git-log[1]'s
+i.e. commits that would be excluded by linkgit:git-log[1]'s
`--ancestry-path` option will keep their original ancestry by default. If
the `rebase-cousins` mode is turned on, such commits are instead rebased
onto `<upstream>` (or `<onto>`, if specified).
diff --git a/gitattributes.html b/gitattributes.html
index efa903e..0d25c69 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -1137,7 +1137,7 @@
</div></div>
<div class="paragraph"><p>Use the following attributes if your <em>*.ps1</em> files are UTF-16 little
endian encoded without BOM and you want Git to use Windows line endings
-in the working directory (use <code>UTF-16-LE-BOM</code> instead of <code>UTF-16LE</code> if
+in the working directory (use <code>UTF-16LE-BOM</code> instead of <code>UTF-16LE</code> if
you want UTF-16 little endian with BOM).
Please note, it is highly recommended to
explicitly define the line endings with <code>eol</code> if the <code>working-tree-encoding</code>
@@ -2154,7 +2154,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2019-02-06 23:17:45 PST
+ 2019-03-11 18:02:43 JST
</div>
</div>
</body>
diff --git a/gitattributes.txt b/gitattributes.txt
index 9b41f81..bdd11a2 100644
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -346,7 +346,7 @@
Use the following attributes if your '*.ps1' files are UTF-16 little
endian encoded without BOM and you want Git to use Windows line endings
-in the working directory (use `UTF-16-LE-BOM` instead of `UTF-16LE` if
+in the working directory (use `UTF-16LE-BOM` instead of `UTF-16LE` if
you want UTF-16 little endian with BOM).
Please note, it is highly recommended to
explicitly define the line endings with `eol` if the `working-tree-encoding`
