summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-01-27 09:46:43 -0800
committerJunio C Hamano <gitster@pobox.com>2023-01-27 09:46:43 -0800
commitd71eb7dd5b4fb3cafaa3d603f625c0a0f75373f4 (patch)
treea188c7c0c3c81d2b910440dc14a6a5bcf057aa6d
parentc2ce68948000710bfac0e3999df05eda7a465977 (diff)
downloadgit-htmldocs-d71eb7dd5b4fb3cafaa3d603f625c0a0f75373f4.tar.gz
Autogenerated HTML docs for v2.39.1-367-g5cc98
-rw-r--r--RelNotes/2.40.0.txt18
-rw-r--r--git-branch.html5
-rw-r--r--git-branch.txt4
-rw-r--r--git-cat-file.html17
-rw-r--r--git-cat-file.txt19
-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
21 files changed, 64 insertions, 31 deletions
diff --git a/RelNotes/2.40.0.txt b/RelNotes/2.40.0.txt
index df729641e..01f539ec0 100644
--- a/RelNotes/2.40.0.txt
+++ b/RelNotes/2.40.0.txt
@@ -40,6 +40,9 @@ UI, Workflows & Features
* "scalar" learned to give progress bar.
+ * "grep -P" learned to use Unicode Character Property to grok
+ character classes when processing \b and \w etc.
+
Performance, Internal Implementation, Development Support etc.
@@ -172,6 +175,20 @@ Fixes since v2.39
joined.
(merge 238a9dfe86 sk/win32-close-handle-upon-pthread-join later to maint).
+ * "git send-email -v 3" used to be expanded to "git send-email
+ --validate 3" when the user meant to pass them down to
+ "format-patch", which has been corrected.
+ (merge 8774aa56ad km/send-email-with-v-reroll-count later to maint).
+
+ * Document that "branch -f <branch>" disables only the safety to
+ avoid recreating an existing branch.
+ (merge bf08abac56 jc/doc-branch-update-checked-out-branch later to maint).
+
+ * "git fetch <group>", when "<group>" of remotes lists the same
+ remote twice, unnecessarily failed when parallel fetching was
+ enabled, which has been corrected.
+ (merge 06a668cb90 cw/fetch-remote-group-with-duplication later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge 77e04b2ed4 rs/t4205-do-not-exit-in-test-script later to maint).
(merge faebba436e rs/plug-pattern-list-leak-in-lof later to maint).
@@ -201,3 +218,4 @@ Fixes since v2.39
(merge cf4936ed74 tl/ls-tree-code-clean-up later to maint).
(merge dcb47e52b0 en/t6426-todo-cleanup later to maint).
(merge 5b8db44bdd jc/format-patch-v-unleak later to maint).
+ (merge 590b636737 jk/hash-object-literally-fd-leak later to maint).
diff --git a/git-branch.html b/git-branch.html
index af96043de..64e50d565 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -883,6 +883,9 @@ way to clean up all obsolete remote-tracking branches.</p></div>
<code>-m</code> (or <code>--move</code>), allow renaming the branch even if the new
branch name already exists, the same applies for <code>-c</code> (or <code>--copy</code>).
</p>
+<div class="paragraph"><p>Note that <em>git branch -f &lt;branchname&gt; [&lt;start-point&gt;]</em>, even with <em>-f</em>,
+refuses to change an existing branch <code>&lt;branchname&gt;</code> that is checked out
+in another worktree linked to the same repository.</p></div>
</dd>
<dt class="hdlist1">
-m
@@ -1580,7 +1583,7 @@ a branch?&#8221;</a> in the Git User&#8217;s Manual.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2023-01-04 22:32:44 PST
+ 2023-01-27 09:44:35 PST
</div>
</div>
</body>
diff --git a/git-branch.txt b/git-branch.txt
index aa2f78c4c..d382ac69f 100644
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -123,6 +123,10 @@ OPTIONS
points to a valid commit. In combination with
`-m` (or `--move`), allow renaming the branch even if the new
branch name already exists, the same applies for `-c` (or `--copy`).
++
+Note that 'git branch -f <branchname> [<start-point>]', even with '-f',
+refuses to change an existing branch `<branchname>` that is checked out
+in another worktree linked to the same repository.
-m::
--move::
diff --git a/git-cat-file.html b/git-cat-file.html
index ee4455e29..fadfda4fe 100644
--- a/git-cat-file.html
+++ b/git-cat-file.html
@@ -897,15 +897,15 @@ whitespace, so that the appropriate drivers can be determined.</p></div>
Print object information and contents for each object provided
on stdin. May not be combined with any other options or arguments
except <code>--textconv</code>, <code>--filters</code>, or <code>--use-mailmap</code>.
- <br />
</p>
+<div class="openblock">
+<div class="content">
<div class="ulist"><ul>
<li>
<p>
When used with <code>--textconv</code> or <code>--filters</code>, the input lines
must specify the path, separated by whitespace. See the section
<code>BATCH OUTPUT</code> below for details.
- <br />
</p>
</li>
<li>
@@ -918,6 +918,7 @@ When used with <code>--use-mailmap</code>, for commit and tag objects, the
</p>
</li>
</ul></div>
+</div></div>
</dd>
<dt class="hdlist1">
--batch-check
@@ -930,15 +931,15 @@ When used with <code>--use-mailmap</code>, for commit and tag objects, the
Print object information for each object provided on stdin. May not be
combined with any other options or arguments except <code>--textconv</code>, <code>--filters</code>
or <code>--use-mailmap</code>.
- <br />
</p>
+<div class="openblock">
+<div class="content">
<div class="ulist"><ul>
<li>
<p>
When used with <code>--textconv</code> or <code>--filters</code>, the input lines must
specify the path, separated by whitespace. See the section
<code>BATCH OUTPUT</code> below for details.
- <br />
</p>
</li>
<li>
@@ -949,6 +950,7 @@ When used with <code>--use-mailmap</code>, for commit and tag objects, the
</p>
</li>
</ul></div>
+</div></div>
</dd>
<dt class="hdlist1">
--batch-command
@@ -961,15 +963,15 @@ When used with <code>--use-mailmap</code>, for commit and tag objects, the
Enter a command mode that reads commands and arguments from stdin. May
only be combined with <code>--buffer</code>, <code>--textconv</code>, <code>--use-mailmap</code> or
<code>--filters</code>.
- <br />
</p>
+<div class="openblock">
+<div class="content">
<div class="ulist"><ul>
<li>
<p>
When used with <code>--textconv</code> or <code>--filters</code>, the input lines must
specify the path, separated by whitespace. See the section
<code>BATCH OUTPUT</code> below for details.
- <br />
</p>
</li>
<li>
@@ -982,6 +984,7 @@ When used with <code>--use-mailmap</code>, for commit and tag objects, the
</p>
</li>
</ul></div>
+</div></div>
<div class="paragraph"><p><code>--batch-command</code> recognizes the following commands:</p></div>
<div class="openblock">
<div class="content">
@@ -1327,7 +1330,7 @@ will be reported.</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2023-01-04 22:32:44 PST
+ 2023-01-27 09:44:35 PST
</div>
</div>
</body>
diff --git a/git-cat-file.txt b/git-cat-file.txt
index 830f0a2ef..411de2e27 100644
--- a/git-cat-file.txt
+++ b/git-cat-file.txt
@@ -93,47 +93,52 @@ OPTIONS
Print object information and contents for each object provided
on stdin. May not be combined with any other options or arguments
except `--textconv`, `--filters`, or `--use-mailmap`.
- +
++
+--
* When used with `--textconv` or `--filters`, the input lines
must specify the path, separated by whitespace. See the section
`BATCH OUTPUT` below for details.
- +
+
* When used with `--use-mailmap`, for commit and tag objects, the
contents part of the output shows the identities replaced using the
mailmap mechanism, while the information part of the output shows
the size of the object as if it actually recorded the replacement
identities.
+--
--batch-check::
--batch-check=<format>::
Print object information for each object provided on stdin. May not be
combined with any other options or arguments except `--textconv`, `--filters`
or `--use-mailmap`.
- +
++
+--
* When used with `--textconv` or `--filters`, the input lines must
specify the path, separated by whitespace. See the section
`BATCH OUTPUT` below for details.
- +
+
* When used with `--use-mailmap`, for commit and tag objects, the
printed object information shows the size of the object as if the
identities recorded in it were replaced by the mailmap mechanism.
+--
--batch-command::
--batch-command=<format>::
Enter a command mode that reads commands and arguments from stdin. May
only be combined with `--buffer`, `--textconv`, `--use-mailmap` or
`--filters`.
- +
++
+--
* When used with `--textconv` or `--filters`, the input lines must
specify the path, separated by whitespace. See the section
`BATCH OUTPUT` below for details.
- +
+
* When used with `--use-mailmap`, for commit and tag objects, the
`contents` command shows the identities replaced using the
mailmap mechanism, while the `info` command shows the size
of the object as if it actually recorded the replacement
identities.
-
+--
+
`--batch-command` recognizes the following commands:
+
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 546568f01..731cfb1b4 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -1038,7 +1038,7 @@ Thanks,
<div id="footer">
<div id="footer-text">
Last updated
- 2023-01-23 14:33:16 PST
+ 2023-01-27 09:45:09 PST
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index df186f191..367a1e8a6 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
- 2023-01-23 14:33:16 PST
+ 2023-01-27 09:45:09 PST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 1c0371677..a533844d8 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1478,7 +1478,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2023-01-23 14:33:16 PST
+ 2023-01-27 09:45:09 PST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html
index 435f2409b..304dce106 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
- 2023-01-23 14:33:14 PST
+ 2023-01-27 09:45:07 PST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index e9310d941..a6a541d0a 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
- 2023-01-23 14:33:16 PST
+ 2023-01-27 09:45:09 PST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 13a70637d..07010b44b 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
- 2023-01-23 14:33:16 PST
+ 2023-01-27 09:45:09 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 956d8b1bf..4fa6ceff8 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
- 2023-01-23 14:33:16 PST
+ 2023-01-27 09:45:08 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 2659531c4..c3fb2af0f 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
- 2023-01-23 14:33:16 PST
+ 2023-01-27 09:45:08 PST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 58723c827..ae421ab8f 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
- 2023-01-23 14:33:15 PST
+ 2023-01-27 09:45:08 PST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 128cefae3..dda9a6424 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
- 2023-01-23 14:33:14 PST
+ 2023-01-27 09:45:07 PST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index f6496c3fb..79af5c4d6 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
- 2023-01-23 14:33:15 PST
+ 2023-01-27 09:45:08 PST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index b70a209f9..53111c3ca 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
- 2023-01-23 14:33:15 PST
+ 2023-01-27 09:45:08 PST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index f939b5f2c..56ec3851a 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
- 2023-01-23 14:33:15 PST
+ 2023-01-27 09:45:08 PST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 532babef8..edb8b73d9 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
- 2023-01-23 14:33:14 PST
+ 2023-01-27 09:45:07 PST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 619e750d5..bee3d55b2 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
- 2023-01-23 14:33:14 PST
+ 2023-01-27 09:45:07 PST
</div>
</div>
</body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index 1df8f9540..a0965d3d6 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
- 2023-01-23 14:33:14 PST
+ 2023-01-27 09:45:07 PST
</div>
</div>
</body>