summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-08 13:18:15 -0700
committerJunio C Hamano <gitster@pobox.com>2022-08-08 13:18:15 -0700
commit87754f3853c49eb47d238abf9a2f035464df284f (patch)
tree810cc5793aa73f63a3c6b91bd32b4d38e65169f7
parent7e2bf2c493dff91017499f0cd6f60335172ab728 (diff)
downloadgit-htmldocs-87754f3853c49eb47d238abf9a2f035464df284f.tar.gz
Autogenerated HTML docs for v2.37.1-394-gc5092
-rw-r--r--RelNotes/2.38.0.txt20
-rw-r--r--howto/coordinate-embargoed-releases.html2
-rw-r--r--howto/keep-canonical-history-correct.html2
-rw-r--r--howto/maintain-git.html2
-rw-r--r--howto/new-command.html2
-rw-r--r--howto/rebase-from-internal-branch.html2
-rw-r--r--howto/rebuild-from-update-hook.html2
-rw-r--r--howto/recover-corrupted-blob-object.html2
-rw-r--r--howto/recover-corrupted-object-harder.html2
-rw-r--r--howto/revert-a-faulty-merge.html2
-rw-r--r--howto/revert-branch-rebase.html2
-rw-r--r--howto/separating-topic-branches.html2
-rw-r--r--howto/setup-git-server-over-http.html2
-rw-r--r--howto/update-hook-example.html2
-rw-r--r--howto/use-git-daemon.html2
-rw-r--r--howto/using-merge-subtree.html2
-rw-r--r--howto/using-signed-tag-in-pull-request.html2
17 files changed, 36 insertions, 16 deletions
diff --git a/RelNotes/2.38.0.txt b/RelNotes/2.38.0.txt
index 5914353a6..c3de8e2cd 100644
--- a/RelNotes/2.38.0.txt
+++ b/RelNotes/2.38.0.txt
@@ -213,6 +213,26 @@ Fixes since v2.37
has been removed.
(merge 75707da4fa jr/gitweb-title-shortening later to maint).
+ * Fix build procedure for Windows that uses CMake so that it can pick
+ up the shell interpreter from local installation location.
+ (merge 476e54b1c6 ca/unignore-local-installation-on-windows later to maint).
+
+ * Conditionally allow building Python interpreter on Windows
+ (merge 2f0623aaa7 js/mingw-with-python later to maint).
+
+ * Fix to lstat() emulation on Windows.
+ (merge 82ba1191ff js/lstat-mingw-enotdir-fix later to maint).
+
+ * Older gcc with -Wall complains about the universal zero initializer
+ "struct s = { 0 };" idiom, which makes developers' lives
+ inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The
+ build procedure has been tweaked to help these compilers.
+ (merge b53a5f2416 jk/struct-zero-init-with-older-gcc later to maint).
+
+ * Plug memory leaks in the failure code path in the "merge-ort" merge
+ strategy backend.
+ (merge 1250dff32b js/ort-clean-up-after-failed-merge later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge a700395eaf ma/t4200-update later to maint).
(merge ce5f07983d mt/pkt-line-comment-tweak later to maint).
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index c89543d8f..ae76b4b94 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -873,7 +873,7 @@ Thanks,
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:55 PDT
+ 2022-08-08 13:16:00 PDT
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index ec404f762..ae4c0cc85 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:55 PDT
+ 2022-08-08 13:16:00 PDT
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 28fe66a67..e9db7a5b0 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:55 PDT
+ 2022-08-08 13:16:00 PDT
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html
index 8bcb623cd..b854237e6 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -863,7 +863,7 @@ letter [PATCH 0/n].
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:53 PDT
+ 2022-08-08 13:15:56 PDT
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index e8cbf55b1..0bbf6b20f 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ the #1' commit.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:55 PDT
+ 2022-08-08 13:15:59 PDT
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index fc0ace325..80f7b0328 100644
--- a/howto/rebuild-from-update-hook.html
+++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:55 PDT
+ 2022-08-08 13:15:59 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 1cbd487e9..a71a02944 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ thing.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:54 PDT
+ 2022-08-08 13:15:59 PDT
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 248dac34d..e7e3bd131 100644
--- a/howto/recover-corrupted-object-harder.html
+++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ int main(int argc, char **argv)
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:55 PDT
+ 2022-08-08 13:15:59 PDT
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 58458e97a..292aeff9f 100644
--- a/howto/revert-a-faulty-merge.html
+++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:54 PDT
+ 2022-08-08 13:15:58 PDT
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 4dbea9408..1bbc4af30 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:53 PDT
+ 2022-08-08 13:15:56 PDT
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index be51fed25..c183b13b7 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ o---o"master"</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:54 PDT
+ 2022-08-08 13:15:58 PDT
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 095a75ac8..9f0ebdf11 100644
--- a/howto/setup-git-server-over-http.html
+++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:54 PDT
+ 2022-08-08 13:15:58 PDT
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 421da9d38..0a619fea8 100644
--- a/howto/update-hook-example.html
+++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:54 PDT
+ 2022-08-08 13:15:58 PDT
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 9b71ba179..e5df44709 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:53 PDT
+ 2022-08-08 13:15:57 PDT
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 6e750357d..868ca00de 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:53 PDT
+ 2022-08-08 13:15:57 PDT
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index b7280998b..20346896c 100644
--- a/howto/using-signed-tag-in-pull-request.html
+++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ as part of the merge commit.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2022-08-05 16:26:53 PDT
+ 2022-08-08 13:15:57 PDT
</div>
</div>
</body>