diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:15:13 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-01-05 14:15:13 -0800 |
commit | e872a1cfb365aa9016e685705d691f75c4585220 (patch) | |
tree | 0cd8bbdef3f464a809208b7f0c3de532d991b2f5 | |
parent | 05fe8d182bb7801152b0db4240ccc5643720f773 (diff) | |
download | git-htmldocs-e872a1cfb365aa9016e685705d691f75c4585220.tar.gz |
Autogenerated HTML docs for v2.34.1-493-ge83ba
28 files changed, 176 insertions, 38 deletions
diff --git a/RelNotes/2.35.0.txt b/RelNotes/2.35.0.txt index aa311cb96..ff90dd477 100644 --- a/RelNotes/2.35.0.txt +++ b/RelNotes/2.35.0.txt @@ -65,6 +65,21 @@ UI, Workflows & Features * The "init" and "set" subcommands in "git sparse-checkout" have been unified for a better user experience and performance. + * Many git commands that deal with working tree files try to remove a + directory that becomes empty (i.e. "git switch" from a branch that + has the directory to another branch that does not would attempt + remove all files in the directory and the directory itself). This + drops users into an unfamiliar situation if the command was run in + a subdirectory that becomes subject to removal due to the command. + The commands have been taught to keep an empty directory if it is + the directory they were started in to avoid surprising users. + + * "git am" learns "--empty=(stop|drop|keep)" option to tweak what is + done to a piece of e-mail without a patch in it. + + * The default merge message prepared by "git merge" records the name + of the current branch; the name can be overridden with a new option + to allow users to pretend a merge is made on a different branch. Performance, Internal Implementation, Development Support etc. @@ -141,6 +156,21 @@ Performance, Internal Implementation, Development Support etc. * Broken &&-chains in the test scripts have been corrected. + * The RCS keyword substitution in "git p4" used to be done assuming + that the contents are UTF-8 text, which can trigger decoding + errors. We now treat the contents as a bytestring for robustness + and correctness. + + * The conditions to choose different definitions of the FLEX_ARRAY + macro for vendor compilers has been simplified to make it easier to + maintain. + + * Correctness and performance update to "diff --color-moved" feature. + + * "git upload-pack" (the other side of "git fetch") used a 8kB buffer + but most of its payload came on 64kB "packets". The buffer size + has been enlarged so that such a packet fits. + Fixes since v2.34 ----------------- @@ -265,6 +295,21 @@ Fixes since v2.34 which has been corrected. (merge 17baeaf82d ab/fetch-set-upstream-while-detached later to maint). + * Among some code paths that ask an yes/no question, only one place + gave a prompt that looked different from the others, which has been + updated to match what the others create. + (merge 0fc8ed154c km/help-prompt-fix later to maint). + + * "git log --invert-grep --author=<name>" used to exclude commits + written by the given author, but now "--invert-grep" only affects + the matches made by the "--grep=<pattern>" option. + (merge 794c000267 rs/log-invert-grep-with-headers later to maint). + + * "git grep --perl-regexp" failed to match UTF-8 characters with + wildcard when the pattern consists only of ASCII letters, which has + been corrected. + (merge 32e3e8bc55 rs/pcre2-utf later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 74db416c9c cw/protocol-v2-doc-fix later to maint). (merge f9b2b6684d ja/doc-cleanup later to maint). @@ -283,3 +328,7 @@ Fixes since v2.34 (merge 2c68f577fc ew/cbtree-remove-unused-and-broken-cb-unlink later to maint). (merge eafd6e7e55 ab/die-with-bug later to maint). (merge 91028f7659 jc/grep-patterntype-default-doc later to maint). + (merge 47ca93d071 ds/repack-fixlets later to maint). + (merge e6a9bc0c60 rs/t4202-invert-grep-test-fix later to maint). + (merge deb5407a42 gh/gpg-doc-markup-fix later to maint). + (merge 999bba3e0b rs/daemon-plug-leak later to maint). diff --git a/git-am.html b/git-am.html index 27b3f9c4a..9be76612f 100644 --- a/git-am.html +++ b/git-am.html @@ -756,8 +756,9 @@ git-am(1) Manual Page [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
[--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
[--quoted-cr=<action>]
+ [--empty=(stop|drop|keep)]
[(<mbox> | <Maildir>)…]
-<em>git am</em> (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])</pre>
+<em>git am</em> (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)</pre>
<div class="attribution">
</div></div>
</div>
@@ -857,6 +858,19 @@ current branch.</p></div> </p>
</dd>
<dt class="hdlist1">
+--empty=(stop|drop|keep)
+</dt>
+<dd>
+<p>
+ By default, or when the option is set to <em>stop</em>, the command
+ errors out on an input e-mail message lacking a patch
+ and stops into the middle of the current am session. When this
+ option is set to <em>drop</em>, skip such an e-mail message instead.
+ When this option is set to <em>keep</em>, create an empty commit,
+ recording the contents of the e-mail message as its log.
+</p>
+</dd>
+<dt class="hdlist1">
-m
</dt>
<dt class="hdlist1">
@@ -1116,6 +1130,16 @@ default. You can use <code>--no-utf8</code> to override this.</p></div> Defaults to <code>raw</code>.
</p>
</dd>
+<dt class="hdlist1">
+--allow-empty
+</dt>
+<dd>
+<p>
+ After a patch failure on an input e-mail message lacking a patch,
+ create an empty commit with the contents of the e-mail message
+ as its log message.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -1209,7 +1233,7 @@ information.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-09-23 14:33:59 PDT
+ 2022-01-05 14:13:29 PST
</div>
</div>
</body>
diff --git a/git-am.txt b/git-am.txt index 0a4a984df..09107fb10 100644 --- a/git-am.txt +++ b/git-am.txt @@ -16,8 +16,9 @@ SYNOPSIS [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet] [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>] [--quoted-cr=<action>] + [--empty=(stop|drop|keep)] [(<mbox> | <Maildir>)...] -'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)]) +'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty) DESCRIPTION ----------- @@ -63,6 +64,14 @@ OPTIONS --quoted-cr=<action>:: This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]). +--empty=(stop|drop|keep):: + By default, or when the option is set to 'stop', the command + errors out on an input e-mail message lacking a patch + and stops into the middle of the current am session. When this + option is set to 'drop', skip such an e-mail message instead. + When this option is set to 'keep', create an empty commit, + recording the contents of the e-mail message as its log. + -m:: --message-id:: Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), @@ -191,6 +200,11 @@ default. You can use `--no-utf8` to override this. the e-mail message; if `diff`, show the diff portion only. Defaults to `raw`. +--allow-empty:: + After a patch failure on an input e-mail message lacking a patch, + create an empty commit with the contents of the e-mail message + as its log message. + DISCUSSION ---------- diff --git a/git-config.html b/git-config.html index 4afe9da64..c9e17ac3a 100644 --- a/git-config.html +++ b/git-config.html @@ -5947,13 +5947,17 @@ gpg.minTrustLevel </li>
</ul></div>
</dd>
-</dl></div>
-<div class="paragraph"><p>gpg.ssh.defaultKeyCommand:
+<dt class="hdlist1">
+gpg.ssh.defaultKeyCommand
+</dt>
+<dd>
+<p>
This command that will be run when user.signingkey is not set and a ssh
signature is requested. On successful exit a valid ssh public key is
expected in the first line of its output. To automatically use the first
- available key from your ssh-agent set this to "ssh-add -L".</p></div>
-<div class="dlist"><dl>
+ available key from your ssh-agent set this to "ssh-add -L".
+</p>
+</dd>
<dt class="hdlist1">
gpg.ssh.allowedSignersFile
</dt>
@@ -5962,7 +5966,7 @@ gpg.ssh.allowedSignersFile A file containing ssh public keys which you are willing to trust.
The file consists of one or more lines of principals followed by an ssh
public key.
- e.g.: <a href="mailto:user1@example.com">user1@example.com</a>,<a href="mailto:user2@example.com">user2@example.com</a> ssh-rsa AAAAX1…
+ e.g.: <code>user1@example.com,user2@example.com ssh-rsa AAAAX1...</code>
See ssh-keygen(1) "ALLOWED SIGNERS" for details.
The principal is only used to identify the key and is available when
verifying a signature.
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 96a44566f..6637d6b75 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html @@ -749,7 +749,7 @@ git-fmt-merge-msg(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git fmt-merge-msg</em> [-m <message>] [--log[=<n>] | --no-log]
+<pre class="content"><em>git fmt-merge-msg</em> [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log]
<em>git fmt-merge-msg</em> [-m <message>] [--log[=<n>] | --no-log] -F <file></pre>
<div class="attribution">
</div></div>
@@ -812,6 +812,15 @@ automatically invoking <em>git merge</em>.</p></div> </p>
</dd>
<dt class="hdlist1">
+--into-name <branch>
+</dt>
+<dd>
+<p>
+ Prepare the merge message as if merging to the branch <code><branch></code>,
+ instead of the name of the real branch to which the merge is made.
+</p>
+</dd>
+<dt class="hdlist1">
-F <file>
</dt>
<dt class="hdlist1">
@@ -908,7 +917,7 @@ the "origin" remote.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2022-01-05 14:13:29 PST
</div>
</div>
</body>
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 6793d8fc0..6f28812f3 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -9,7 +9,7 @@ git-fmt-merge-msg - Produce a merge commit message SYNOPSIS -------- [verse] -'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] +'git fmt-merge-msg' [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log] 'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file> DESCRIPTION @@ -44,6 +44,10 @@ OPTIONS Use <message> instead of the branch names for the first line of the log message. For use with `--log`. +--into-name <branch>:: + Prepare the merge message as if merging to the branch `<branch>`, + instead of the name of the real branch to which the merge is made. + -F <file>:: --file <file>:: Take the list of merged objects from <file> instead of diff --git a/git-format-patch.html b/git-format-patch.html index 1a10ca389..9b8a863af 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -758,7 +758,7 @@ git-format-patch(1) Manual Page [-n | --numbered | -N | --no-numbered]
[--start-number <n>] [--numbered-files]
[--in-reply-to=<message id>] [--suffix=.<sfx>]
- [--ignore-if-in-upstream]
+ [--ignore-if-in-upstream] [--always]
[--cover-from-description=<mode>]
[--rfc] [--subject-prefix=<subject prefix>]
[(--reroll-count|-v) <n>]
@@ -1794,6 +1794,15 @@ will want to ensure that threading is disabled for <code>git send-email</code>.< </p>
</dd>
<dt class="hdlist1">
+--always
+</dt>
+<dd>
+<p>
+ Include patches for commits that do not introduce any change,
+ which are omitted by default.
+</p>
+</dd>
+<dt class="hdlist1">
--cover-from-description=<mode>
</dt>
<dd>
@@ -2569,7 +2578,7 @@ merge commit.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-11-01 17:08:30 PDT
+ 2022-01-05 14:13:29 PST
</div>
</div>
</body>
diff --git a/git-format-patch.txt b/git-format-patch.txt index 113eabc10..be797d7a2 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -18,7 +18,7 @@ SYNOPSIS [-n | --numbered | -N | --no-numbered] [--start-number <n>] [--numbered-files] [--in-reply-to=<message id>] [--suffix=.<sfx>] - [--ignore-if-in-upstream] + [--ignore-if-in-upstream] [--always] [--cover-from-description=<mode>] [--rfc] [--subject-prefix=<subject prefix>] [(--reroll-count|-v) <n>] @@ -192,6 +192,10 @@ will want to ensure that threading is disabled for `git send-email`. patches being generated, and any patch that matches is ignored. +--always:: + Include patches for commits that do not introduce any change, + which are omitted by default. + --cover-from-description=<mode>:: Controls which parts of the cover letter will be automatically populated using the branch's description. diff --git a/git-merge.html b/git-merge.html index c58f97525..00ae76cc1 100644 --- a/git-merge.html +++ b/git-merge.html @@ -752,7 +752,8 @@ git-merge(1) Manual Page <pre class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
[--[no-]allow-unrelated-histories]
- [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>…]
+ [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>]
+ [--into-name <branch>] [<commit>…]
<em>git merge</em> (--continue | --abort | --quit)</pre>
<div class="attribution">
</div></div>
@@ -1122,6 +1123,16 @@ used to give a good default for automated <em>git merge</em> invocations. The automated message can include the branch description.</p></div>
</dd>
<dt class="hdlist1">
+--into-name <branch>
+</dt>
+<dd>
+<p>
+ Prepare the default merge message as if merging to the branch
+ <code><branch></code>, instead of the name of the real branch to which
+ the merge is made.
+</p>
+</dd>
+<dt class="hdlist1">
-F <file>
</dt>
<dt class="hdlist1">
@@ -2206,7 +2217,7 @@ branch.<name>.mergeOptions <div id="footer">
<div id="footer-text">
Last updated
- 2021-12-15 12:58:55 PST
+ 2022-01-05 14:13:29 PST
</div>
</div>
</body>
diff --git a/git-merge.txt b/git-merge.txt index e8cecf5a5..3125473cc 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -12,7 +12,8 @@ SYNOPSIS 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]allow-unrelated-histories] - [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...] + [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] + [--into-name <branch>] [<commit>...] 'git merge' (--continue | --abort | --quit) DESCRIPTION @@ -76,6 +77,11 @@ The 'git fmt-merge-msg' command can be used to give a good default for automated 'git merge' invocations. The automated message can include the branch description. +--into-name <branch>:: + Prepare the default merge message as if merging to the branch + `<branch>`, instead of the name of the real branch to which + the merge is made. + -F <file>:: --file=<file>:: Read the commit message to be used for the merge commit (in diff --git a/git-repack.html b/git-repack.html index f1bba82c1..64ff6e3bc 100644 --- a/git-repack.html +++ b/git-repack.html @@ -849,10 +849,13 @@ to the new separate pack will be written.</p></div> <dt class="hdlist1">
-q
</dt>
+<dt class="hdlist1">
+--quiet
+</dt>
<dd>
<p>
- Pass the <code>-q</code> option to <em>git pack-objects</em>. See
- <a href="git-pack-objects.html">git-pack-objects(1)</a>.
+ Show no progress over the standard error stream and pass the <code>-q</code>
+ option to <em>git pack-objects</em>. See <a href="git-pack-objects.html">git-pack-objects(1)</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -1088,7 +1091,7 @@ attribute <code>delta</code> set to false.</p></div> <div id="footer">
<div id="footer-text">
Last updated
- 2021-10-18 17:00:13 PDT
+ 2022-01-05 14:13:29 PST
</div>
</div>
</body>
diff --git a/git-repack.txt b/git-repack.txt index 7183fb498..ee30edc17 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -76,8 +76,9 @@ to the new separate pack will be written. linkgit:git-pack-objects[1]. -q:: - Pass the `-q` option to 'git pack-objects'. See - linkgit:git-pack-objects[1]. +--quiet:: + Show no progress over the standard error stream and pass the `-q` + option to 'git pack-objects'. See linkgit:git-pack-objects[1]. -n:: Do not update the server information with diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 3418b430c..01f28d0e9 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-01-03 16:49:32 PST
+ 2022-01-05 14:14:06 PST
</div>
</div>
</body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 40434f022..f8343bd8b 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-01-03 16:49:32 PST
+ 2022-01-05 14:14:05 PST
</div>
</div>
</body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 46d8049a9..17438b861 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-01-03 16:49:32 PST
+ 2022-01-05 14:14:06 PST
</div>
</div>
</body>
diff --git a/howto/new-command.html b/howto/new-command.html index 4d9ba0791..69b1ae48d 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-01-03 16:49:30 PST
+ 2022-01-05 14:14:04 PST
</div>
</div>
</body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 10af21cda..c2b90b501 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-01-03 16:49:32 PST
+ 2022-01-05 14:14:05 PST
</div>
</div>
</body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 52582321d..10b97d862 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-01-03 16:49:32 PST
+ 2022-01-05 14:14:05 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index f4ebcfbd7..cd5de5ec9 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-01-03 16:49:31 PST
+ 2022-01-05 14:14:05 PST
</div>
</div>
</body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 2911528c9..8e02d37ce 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-01-03 16:49:31 PST
+ 2022-01-05 14:14:05 PST
</div>
</div>
</body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 1f8861c71..1bd2e6b87 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-01-03 16:49:31 PST
+ 2022-01-05 14:14:05 PST
</div>
</div>
</body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 45ca9392b..085e014d5 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-01-03 16:49:30 PST
+ 2022-01-05 14:14:04 PST
</div>
</div>
</body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index b7792ab01..e0c14ce82 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-01-03 16:49:31 PST
+ 2022-01-05 14:14:05 PST
</div>
</div>
</body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 780edd8fc..577cc0694 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-01-03 16:49:31 PST
+ 2022-01-05 14:14:05 PST
</div>
</div>
</body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index e55b19a79..afc4659f1 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-01-03 16:49:31 PST
+ 2022-01-05 14:14:04 PST
</div>
</div>
</body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 98fa8315b..5e6a0a6c0 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-01-03 16:49:31 PST
+ 2022-01-05 14:14:04 PST
</div>
</div>
</body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 8c6fd8514..7a1d3d35e 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-01-03 16:49:30 PST
+ 2022-01-05 14:14:04 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 4f7b3e662..e5c85160c 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-01-03 16:49:30 PST
+ 2022-01-05 14:14:04 PST
</div>
</div>
</body>
|