Autogenerated HTML docs for v2.39.1-409-ga6a32

21 files changed, 254 insertions, 190 deletions

diff --git a/RelNotes/2.40.0.txt b/RelNotes/2.40.0.txt
index 7e6d1171c..7ddfafc2e 100644
--- a/RelNotes/2.40.0.txt
+++ b/RelNotes/2.40.0.txt
@@ -43,6 +43,9 @@ UI, Workflows & Features
  * "grep -P" learned to use Unicode Character Property to grok
    character classes when processing \b and \w etc.
 
+ * "git rebase" often ignored incompatible options instead of
+   complaining, which has been corrected.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -197,6 +200,10 @@ Fixes since v2.39
    formed with the same code as "git fsck".
    (merge 8e4309038f jk/hash-object-fsck later to maint).
 
+ * Improve the error message given when private key is not loaded in
+   the ssh agent in the codepath to sign with an ssh key.
+   (merge dce7b31126 as/ssh-signing-improve-key-missing-error 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).
@@ -229,3 +236,4 @@ Fixes since v2.39
    (merge 590b636737 jk/hash-object-literally-fd-leak later to maint).
    (merge 5458ba0a4d tb/t0003-invoke-dd-more-portably later to maint).
    (merge 70661d288b ar/markup-em-dash later to maint).
+   (merge e750951e74 en/ls-files-doc-update later to maint).
diff --git a/git-ls-files.html b/git-ls-files.html
index e81b784bf..d18d792ad 100644
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -752,6 +752,7 @@ git-ls-files(1) Manual Page
 <pre class="content"><em>git ls-files</em> [-z] [-t] [-v] [-f]

                 [-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]

                 [-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]

+                [--resolve-undo]

                 [--directory [--no-empty-directory]] [--eol]

                 [--deduplicate]

                 [-x &lt;pattern&gt;|--exclude=&lt;pattern&gt;]

@@ -771,7 +772,9 @@ git-ls-files(1) Manual Page
 <div class="paragraph"><p>This merges the file listing in the index with the actual working

 directory list, and shows different combinations of the two.</p></div>

 <div class="paragraph"><p>One or more of the options below may be used to determine the files

-shown:</p></div>

+shown, and each file may be printed multiple times if there are

+multiple entries in the index or multiple statuses are applicable for

+the relevant file selection options.</p></div>

 </div>

 </div>

 <div class="sect1">

@@ -786,7 +789,9 @@ shown:</p></div>
 </dt>

 <dd>

 <p>

-        Show cached files in the output (default)

+        Show all files cached in Git&#8217;s index, i.e. all tracked files.

+        (This is the default if no -c/-s/-d/-o/-u/-k/-m/--resolve-undo

+        options are specified.)

 </p>

 </dd>

 <dt class="hdlist1">

@@ -797,7 +802,7 @@ shown:</p></div>
 </dt>

 <dd>

 <p>

-        Show deleted files in the output

+        Show files with an unstaged deletion

 </p>

 </dd>

 <dt class="hdlist1">

@@ -808,7 +813,8 @@ shown:</p></div>
 </dt>

 <dd>

 <p>

-        Show modified files in the output

+        Show files with an unstaged modification (note that an unstaged

+        deletion also counts as an unstaged modification)

 </p>

 </dd>

 <dt class="hdlist1">

@@ -830,11 +836,14 @@ shown:</p></div>
 </dt>

 <dd>

 <p>

-        Show only ignored files in the output. When showing files in the

-        index, print only those matched by an exclude pattern. When

-        showing "other" files, show only those matched by an exclude

-        pattern. Standard ignore rules are not automatically activated,

-        therefore at least one of the <code>--exclude*</code> options is required.

+        Show only ignored files in the output.  Must be used with

+        either an explicit <em>-c</em> or <em>-o</em>.  When showing files in the

+        index (i.e. when used with <em>-c</em>), print only those files

+        matching an exclude pattern.  When showing "other" files

+        (i.e. when used with <em>-o</em>), show only those matched by an

+        exclude pattern.  Standard ignore rules are not automatically

+        activated, therefore at least one of the <code>--exclude*</code> options

+        is required.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -855,6 +864,7 @@ shown:</p></div>
 <p>

         If a whole directory is classified as "other", show just its

         name (with a trailing slash) and not its whole contents.

+        Has no effect without -o/--others.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -873,7 +883,9 @@ shown:</p></div>
 </dt>

 <dd>

 <p>

-        Show unmerged files in the output (forces --stage)

+        Show information about unmerged files in the output, but do

+        not show any other tracked files (forces --stage, overrides

+        --cached).

 </p>

 </dd>

 <dt class="hdlist1">

@@ -884,9 +896,21 @@ shown:</p></div>
 </dt>

 <dd>

 <p>

-        Show files on the filesystem that need to be removed due

-        to file/directory conflicts for checkout-index to

-        succeed.

+        Show untracked files on the filesystem that need to be removed

+        due to file/directory conflicts for tracked files to be able to

+        be written to the filesystem.

+</p>

+</dd>

+<dt class="hdlist1">

+--resolve-undo

+</dt>

+<dd>

+<p>

+        Show files having resolve-undo information in the index

+        together with their resolve-undo information.  (resolve-undo

+        information is what is used to implement "git checkout -m

+        $PATH", i.e. to recreate merge conflicts that were

+        accidentally resolved)

 </p>

 </dd>

 <dt class="hdlist1">

@@ -940,7 +964,8 @@ shown:</p></div>
 <dd>

 <p>

         Read additional exclude patterns that apply only to the

-        directory and its subdirectories in &lt;file&gt;.

+        directory and its subdirectories in &lt;file&gt;.  Deprecated; use

+        --exclude-standard instead.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -978,8 +1003,8 @@ shown:</p></div>
 </dt>

 <dd>

 <p>

-        This feature is semi-deprecated. For scripting purpose,

-        <a href="git-status.html">git-status(1)</a> <code>--porcelain</code> and

+        Show status tags together with filenames.  Note that for

+        scripting purposes, <a href="git-status.html">git-status(1)</a> <code>--porcelain</code> and

         <a href="git-diff-files.html">git-diff-files(1)</a> <code>--name-status</code> are almost always

         superior alternatives, and users should look at

         <a href="git-status.html">git-status(1)</a> <code>--short</code> or <a href="git-diff.html">git-diff(1)</a>

@@ -987,15 +1012,16 @@ shown:</p></div>
 </p>

 <div class="openblock">

 <div class="content">

-<div class="paragraph"><p>This option identifies the file status with the following tags (followed by

-a space) at the start of each line:</p></div>

+<div class="paragraph"><p>This option provides a reason for showing each filename, in the form

+of a status tag (which is followed by a space and then the filename).

+The status tags are all single characters from the following list:</p></div>

 <div class="dlist"><dl>

 <dt class="hdlist1">

 H

 </dt>

 <dd>

 <p>

-cached

+tracked file that is not either unmerged or skip-worktree

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1003,7 +1029,7 @@ S
 </dt>

 <dd>

 <p>

-skip-worktree

+tracked file that is skip-worktree

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1011,7 +1037,7 @@ M
 </dt>

 <dd>

 <p>

-unmerged

+tracked file that is unmerged

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1019,7 +1045,7 @@ R
 </dt>

 <dd>

 <p>

-removed/deleted

+tracked file with unstaged removal/deletion

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1027,7 +1053,7 @@ C
 </dt>

 <dd>

 <p>

-modified/changed

+tracked file with unstaged modification/change

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1035,7 +1061,8 @@ K
 </dt>

 <dd>

 <p>

-to be killed

+untracked paths which are part of file/directory conflicts

+                which prevent checking out tracked files

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1043,7 +1070,15 @@ to be killed
 </dt>

 <dd>

 <p>

-other

+untracked file

+</p>

+</dd>

+<dt class="hdlist1">

+U

+</dt>

+<dd>

+<p>

+file with resolve-undo information

 </p>

 </dd>

 </dl></div>

@@ -1277,7 +1312,9 @@ path
 traversing the directory tree and finding files to show when the

 flags --others or --ignored are specified.  <a href="gitignore.html">gitignore(5)</a>

 specifies the format of exclude patterns.</p></div>

-<div class="paragraph"><p>These exclude patterns come from these places, in order:</p></div>

+<div class="paragraph"><p>Generally, you should just use --exclude-standard, but for historical

+reasons the exclude patterns can be specified from the following

+places, in order:</p></div>

 <div class="olist arabic"><ol class="arabic">

 <li>

 <p>

@@ -1327,7 +1364,7 @@ pattern file appears in.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-11-11 23:55:30 PST

+ 2023-02-03 21:26:01 PST

 </div>

 </div>

 </body>

diff --git a/git-ls-files.txt b/git-ls-files.txt
index 440043cdb..1abdd3c21 100644
--- a/git-ls-files.txt
+++ b/git-ls-files.txt
@@ -12,6 +12,7 @@ SYNOPSIS
 'git ls-files' [-z] [-t] [-v] [-f]
 		[-c|--cached] [-d|--deleted] [-o|--others] [-i|--ignored]
 		[-s|--stage] [-u|--unmerged] [-k|--killed] [-m|--modified]
+		[--resolve-undo]
 		[--directory [--no-empty-directory]] [--eol]
 		[--deduplicate]
 		[-x <pattern>|--exclude=<pattern>]
@@ -28,21 +29,26 @@ This merges the file listing in the index with the actual working
 directory list, and shows different combinations of the two.
 
 One or more of the options below may be used to determine the files
-shown:
+shown, and each file may be printed multiple times if there are
+multiple entries in the index or multiple statuses are applicable for
+the relevant file selection options.
 
 OPTIONS
 -------
 -c::
 --cached::
-	Show cached files in the output (default)
+	Show all files cached in Git's index, i.e. all tracked files.
+	(This is the default if no -c/-s/-d/-o/-u/-k/-m/--resolve-undo
+	options are specified.)
 
 -d::
 --deleted::
-	Show deleted files in the output
+	Show files with an unstaged deletion
 
 -m::
 --modified::
-	Show modified files in the output
+	Show files with an unstaged modification (note that an unstaged
+	deletion also counts as an unstaged modification)
 
 -o::
 --others::
@@ -50,11 +56,14 @@ OPTIONS
 
 -i::
 --ignored::
-	Show only ignored files in the output. When showing files in the
-	index, print only those matched by an exclude pattern. When
-	showing "other" files, show only those matched by an exclude
-	pattern. Standard ignore rules are not automatically activated,
-	therefore at least one of the `--exclude*` options is required.
+	Show only ignored files in the output.  Must be used with
+	either an explicit '-c' or '-o'.  When showing files in the
+	index (i.e. when used with '-c'), print only those files
+	matching an exclude pattern.  When showing "other" files
+	(i.e. when used with '-o'), show only those matched by an
+	exclude pattern.  Standard ignore rules are not automatically
+	activated, therefore at least one of the `--exclude*` options
+	is required.
 
 -s::
 --stage::
@@ -63,19 +72,29 @@ OPTIONS
 --directory::
 	If a whole directory is classified as "other", show just its
 	name (with a trailing slash) and not its whole contents.
+	Has no effect without -o/--others.
 
 --no-empty-directory::
 	Do not list empty directories. Has no effect without --directory.
 
 -u::
 --unmerged::
-	Show unmerged files in the output (forces --stage)
+	Show information about unmerged files in the output, but do
+	not show any other tracked files (forces --stage, overrides
+	--cached).
 
 -k::
 --killed::
-	Show files on the filesystem that need to be removed due
-	to file/directory conflicts for checkout-index to
-	succeed.
+	Show untracked files on the filesystem that need to be removed
+	due to file/directory conflicts for tracked files to be able to
+	be written to the filesystem.
+
+--resolve-undo::
+	Show files having resolve-undo information in the index
+	together with their resolve-undo information.  (resolve-undo
+	information is what is used to implement "git checkout -m
+	$PATH", i.e. to recreate merge conflicts that were
+	accidentally resolved)
 
 -z::
 	\0 line termination on output and do not quote filenames.
@@ -100,7 +119,8 @@ OPTIONS
 
 --exclude-per-directory=<file>::
 	Read additional exclude patterns that apply only to the
-	directory and its subdirectories in <file>.
+	directory and its subdirectories in <file>.  Deprecated; use
+	--exclude-standard instead.
 
 --exclude-standard::
 	Add the standard Git exclusions: .git/info/exclude, .gitignore
@@ -118,24 +138,27 @@ OPTIONS
 	with `-s` or `-u` options does not make any sense.
 
 -t::
-	This feature is semi-deprecated. For scripting purpose,
-	linkgit:git-status[1] `--porcelain` and
+	Show status tags together with filenames.  Note that for
+	scripting purposes, linkgit:git-status[1] `--porcelain` and
 	linkgit:git-diff-files[1] `--name-status` are almost always
 	superior alternatives, and users should look at
 	linkgit:git-status[1] `--short` or linkgit:git-diff[1]
 	`--name-status` for more user-friendly alternatives.
 +
 --
-This option identifies the file status with the following tags (followed by
-a space) at the start of each line:
-
-	H::	cached
-	S::	skip-worktree
-	M::	unmerged
-	R::	removed/deleted
-	C::	modified/changed
-	K::	to be killed
-	?::	other
+This option provides a reason for showing each filename, in the form
+of a status tag (which is followed by a space and then the filename).
+The status tags are all single characters from the following list:
+
+	H::	tracked file that is not either unmerged or skip-worktree
+	S::	tracked file that is skip-worktree
+	M::	tracked file that is unmerged
+	R::	tracked file with unstaged removal/deletion
+	C::	tracked file with unstaged modification/change
+	K::	untracked paths which are part of file/directory conflicts
+		which prevent checking out tracked files
+	?::	untracked file
+	U::     file with resolve-undo information
 --
 
 -v::
@@ -269,7 +292,9 @@ traversing the directory tree and finding files to show when the
 flags --others or --ignored are specified.  linkgit:gitignore[5]
 specifies the format of exclude patterns.
 
-These exclude patterns come from these places, in order:
+Generally, you should just use --exclude-standard, but for historical
+reasons the exclude patterns can be specified from the following
+places, in order:
 
   1. The command-line flag --exclude=<pattern> specifies a
      single pattern.  Patterns are ordered in the same order
diff --git a/git-rebase.html b/git-rebase.html
index 21b0c0c95..764a3458f 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -941,6 +941,72 @@ desired resolution, you can continue the rebasing process with</p></div>
 </div>

 </div>

 <div class="sect1">

+<h2 id="_mode_options">MODE OPTIONS</h2>

+<div class="sectionbody">

+<div class="paragraph"><p>The options in this section cannot be used with any other option,

+including not with each other:</p></div>

+<div class="dlist"><dl>

+<dt class="hdlist1">

+--continue

+</dt>

+<dd>

+<p>

+        Restart the rebasing process after having resolved a merge conflict.

+</p>

+</dd>

+<dt class="hdlist1">

+--skip

+</dt>

+<dd>

+<p>

+        Restart the rebasing process by skipping the current patch.

+</p>

+</dd>

+<dt class="hdlist1">

+--abort

+</dt>

+<dd>

+<p>

+        Abort the rebase operation and reset HEAD to the original

+        branch. If <code>&lt;branch&gt;</code> was provided when the rebase operation was

+        started, then <code>HEAD</code> will be reset to <code>&lt;branch&gt;</code>. Otherwise <code>HEAD</code>

+        will be reset to where it was when the rebase operation was

+        started.

+</p>

+</dd>

+<dt class="hdlist1">

+--quit

+</dt>

+<dd>

+<p>

+        Abort the rebase operation but <code>HEAD</code> is not reset back to the

+        original branch. The index and working tree are also left

+        unchanged as a result. If a temporary stash entry was created

+        using <code>--autostash</code>, it will be saved to the stash list.

+</p>

+</dd>

+<dt class="hdlist1">

+--edit-todo

+</dt>

+<dd>

+<p>

+        Edit the todo list during an interactive rebase.

+</p>

+</dd>

+<dt class="hdlist1">

+--show-current-patch

+</dt>

+<dd>

+<p>

+        Show the current patch in an interactive rebase or when rebase

+        is stopped because of conflicts. This is the equivalent of

+        <code>git show REBASE_HEAD</code>.

+</p>

+</dd>

+</dl></div>

+</div>

+</div>

+<div class="sect1">

 <h2 id="_options">OPTIONS</h2>

 <div class="sectionbody">

 <div class="dlist"><dl>

@@ -1000,37 +1066,6 @@ the merge base to determine the <em>set of commits</em> which will be rebased.</
 </p>

 </dd>

 <dt class="hdlist1">

---continue

-</dt>

-<dd>

-<p>

-        Restart the rebasing process after having resolved a merge conflict.

-</p>

-</dd>

-<dt class="hdlist1">

---abort

-</dt>

-<dd>

-<p>

-        Abort the rebase operation and reset HEAD to the original

-        branch. If <code>&lt;branch&gt;</code> was provided when the rebase operation was

-        started, then <code>HEAD</code> will be reset to <code>&lt;branch&gt;</code>. Otherwise <code>HEAD</code>

-        will be reset to where it was when the rebase operation was

-        started.

-</p>

-</dd>

-<dt class="hdlist1">

---quit

-</dt>

-<dd>

-<p>

-        Abort the rebase operation but <code>HEAD</code> is not reset back to the

-        original branch. The index and working tree are also left

-        unchanged as a result. If a temporary stash entry was created

-        using <code>--autostash</code>, it will be saved to the stash list.

-</p>

-</dd>

-<dt class="hdlist1">

 --apply

 </dt>

 <dd>

@@ -1111,14 +1146,10 @@ read. When using the <em>merge</em> backend, warnings will be issued for each
 dropped commit (unless <code>--quiet</code> is given). Advice will also be issued

 unless <code>advice.skippedCherryPicks</code> is set to false (see

 <a href="git-config.html">git-config(1)</a>).</p></div>

-</dd>

-</dl></div>

-<div class="paragraph"><p>+

-<code>--reapply-cherry-picks</code> allows rebase to forgo reading all upstream

+<div class="paragraph"><p><code>--reapply-cherry-picks</code> allows rebase to forgo reading all upstream

 commits, potentially improving performance.</p></div>

-<div class="paragraph"><p>+

-See also INCOMPATIBLE OPTIONS below.</p></div>

-<div class="dlist"><dl>

+<div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>

+</dd>

 <dt class="hdlist1">

 --allow-empty-message

 </dt>

@@ -1132,32 +1163,6 @@ See also INCOMPATIBLE OPTIONS below.</p></div>
 <div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>

 </dd>

 <dt class="hdlist1">

---skip

-</dt>

-<dd>

-<p>

-        Restart the rebasing process by skipping the current patch.

-</p>

-</dd>

-<dt class="hdlist1">

---edit-todo

-</dt>

-<dd>

-<p>

-        Edit the todo list during an interactive rebase.

-</p>

-</dd>

-<dt class="hdlist1">

---show-current-patch

-</dt>

-<dd>

-<p>

-        Show the current patch in an interactive rebase or when rebase

-        is stopped because of conflicts. This is the equivalent of

-        <code>git show REBASE_HEAD</code>.

-</p>

-</dd>

-<dt class="hdlist1">

 -m

 </dt>

 <dt class="hdlist1">

@@ -1521,10 +1526,7 @@ without an explicit <code>--interactive</code>.</p></div>
 <p>

         Rebase all commits reachable from <code>&lt;branch&gt;</code>, instead of

         limiting them with an <code>&lt;upstream&gt;</code>.  This allows you to rebase

-        the root commit(s) on a branch.  When used with <code>--onto</code>, it

-        will skip changes already contained in <code>&lt;newbase&gt;</code> (instead of

-        <code>&lt;upstream&gt;</code>) whereas without <code>--onto</code> it will operate on every

-        change.

+        the root commit(s) on a branch.

 </p>

 <div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>

 </dd>

@@ -1601,6 +1603,7 @@ start would be overridden by the presence of
 </p>

 <div class="paragraph"><p>If the configuration variable <code>rebase.updateRefs</code> is set, then this option

 can be used to override and disable this setting.</p></div>

+<div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>

 </dd>

 </dl></div>

 </div>

@@ -1645,12 +1648,7 @@ can be used to override and disable this setting.</p></div>
 </li>

 <li>

 <p>

---allow-empty-message

-</p>

-</li>

-<li>

-<p>

---[no-]autosquash

+--autosquash

 </p>

 </li>

 <li>

@@ -1680,12 +1678,7 @@ can be used to override and disable this setting.</p></div>
 </li>

 <li>

 <p>

---reapply-cherry-picks

-</p>

-</li>

-<li>

-<p>

---edit-todo

+--[no-]reapply-cherry-picks when used without --keep-base

 </p>

 </li>

 <li>

@@ -1695,7 +1688,7 @@ can be used to override and disable this setting.</p></div>
 </li>

 <li>

 <p>

---root when used in combination with --onto

+--root when used without --onto

 </p>

 </li>

 </ul></div>

@@ -2777,7 +2770,7 @@ sequence.editor
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-01-21 17:52:14 PST

+ 2023-02-03 21:26:01 PST

 </div>

 </div>

 </body>

diff --git a/git-rebase.txt b/git-rebase.txt
index d811c1cf4..9a295bcee 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -208,6 +208,39 @@ Alternatively, you can undo the 'git rebase' with
 
     git rebase --abort
 
+MODE OPTIONS
+------------
+
+The options in this section cannot be used with any other option,
+including not with each other:
+
+--continue::
+	Restart the rebasing process after having resolved a merge conflict.
+
+--skip::
+	Restart the rebasing process by skipping the current patch.
+
+--abort::
+	Abort the rebase operation and reset HEAD to the original
+	branch. If `<branch>` was provided when the rebase operation was
+	started, then `HEAD` will be reset to `<branch>`. Otherwise `HEAD`
+	will be reset to where it was when the rebase operation was
+	started.
+
+--quit::
+	Abort the rebase operation but `HEAD` is not reset back to the
+	original branch. The index and working tree are also left
+	unchanged as a result. If a temporary stash entry was created
+	using `--autostash`, it will be saved to the stash list.
+
+--edit-todo::
+	Edit the todo list during an interactive rebase.
+
+--show-current-patch::
+	Show the current patch in an interactive rebase or when rebase
+	is stopped because of conflicts. This is the equivalent of
+	`git show REBASE_HEAD`.
+
 OPTIONS
 -------
 --onto <newbase>::
@@ -249,22 +282,6 @@ See also INCOMPATIBLE OPTIONS below.
 <branch>::
 	Working branch; defaults to `HEAD`.
 
---continue::
-	Restart the rebasing process after having resolved a merge conflict.
-
---abort::
-	Abort the rebase operation and reset HEAD to the original
-	branch. If `<branch>` was provided when the rebase operation was
-	started, then `HEAD` will be reset to `<branch>`. Otherwise `HEAD`
-	will be reset to where it was when the rebase operation was
-	started.
-
---quit::
-	Abort the rebase operation but `HEAD` is not reset back to the
-	original branch. The index and working tree are also left
-	unchanged as a result. If a temporary stash entry was created
-	using `--autostash`, it will be saved to the stash list.
-
 --apply::
 	Use applying strategies to rebase (calling `git-am`
 	internally).  This option may become a no-op in the future
@@ -321,7 +338,6 @@ See also INCOMPATIBLE OPTIONS below.
 	upstream changes, the behavior towards them is controlled by
 	the `--empty` flag.)
 +
-
 In the absence of `--keep-base` (or if `--no-reapply-cherry-picks` is
 given), these commits will be automatically dropped.  Because this
 necessitates reading all upstream commits, this can be expensive in
@@ -330,7 +346,6 @@ read. When using the 'merge' backend, warnings will be issued for each
 dropped commit (unless `--quiet` is given). Advice will also be issued
 unless `advice.skippedCherryPicks` is set to false (see
 linkgit:git-config[1]).
-
 +
 `--reapply-cherry-picks` allows rebase to forgo reading all upstream
 commits, potentially improving performance.
@@ -345,17 +360,6 @@ See also INCOMPATIBLE OPTIONS below.
 +
 See also INCOMPATIBLE OPTIONS below.
 
---skip::
-	Restart the rebasing process by skipping the current patch.
-
---edit-todo::
-	Edit the todo list during an interactive rebase.
-
---show-current-patch::
-	Show the current patch in an interactive rebase or when rebase
-	is stopped because of conflicts. This is the equivalent of
-	`git show REBASE_HEAD`.
-
 -m::
 --merge::
 	Using merging strategies to rebase (default).
@@ -574,10 +578,7 @@ See also INCOMPATIBLE OPTIONS below.
 --root::
 	Rebase all commits reachable from `<branch>`, instead of
 	limiting them with an `<upstream>`.  This allows you to rebase
-	the root commit(s) on a branch.  When used with `--onto`, it
-	will skip changes already contained in `<newbase>` (instead of
-	`<upstream>`) whereas without `--onto` it will operate on every
-	change.
+	the root commit(s) on a branch.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -630,6 +631,8 @@ start would be overridden by the presence of
 +
 If the configuration variable `rebase.updateRefs` is set, then this option
 can be used to override and disable this setting.
++
+See also INCOMPATIBLE OPTIONS below.
 
 INCOMPATIBLE OPTIONS
 --------------------
@@ -645,17 +648,15 @@ are incompatible with the following options:
  * --merge
  * --strategy
  * --strategy-option
- * --allow-empty-message
- * --[no-]autosquash
+ * --autosquash
  * --rebase-merges
  * --interactive
  * --exec
  * --no-keep-empty
  * --empty=
- * --reapply-cherry-picks
- * --edit-todo
+ * --[no-]reapply-cherry-picks when used without --keep-base
  * --update-refs
- * --root when used in combination with --onto
+ * --root when used without --onto
 
 In addition, the following pairs of options are incompatible:
 
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 00356db70..6fa13ef4d 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-30 14:46:00 PST

+ 2023-02-03 21:26:34 PST

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index c5754d12c..a0c1d7f91 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-30 14:45:59 PST

+ 2023-02-03 21:26:34 PST

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 6d8d39ee3..03bea7af1 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-30 14:46:00 PST

+ 2023-02-03 21:26:34 PST

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 80a2b67e9..231f1e3a5 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-30 14:45:55 PST

+ 2023-02-03 21:26:32 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index dffa600a2..dfdb9b647 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-30 14:45:59 PST

+ 2023-02-03 21:26:34 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 03d0a8394..96b78d15c 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-30 14:45:59 PST

+ 2023-02-03 21:26:34 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 46519d812..b397a35e5 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-30 14:45:58 PST

+ 2023-02-03 21:26:34 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index d0716fc65..5580a0efc 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-30 14:45:59 PST

+ 2023-02-03 21:26:34 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 613f4da15..58841ef4f 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-30 14:45:58 PST

+ 2023-02-03 21:26:33 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 84afb2659..348d9ed54 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-30 14:45:56 PST

+ 2023-02-03 21:26:32 PST

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index ae81daceb..1378bd511 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-30 14:45:58 PST

+ 2023-02-03 21:26:33 PST

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 7f560e01f..c9a23a4dc 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-30 14:45:57 PST

+ 2023-02-03 21:26:33 PST

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 465ef6ec2..e4c992445 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-30 14:45:57 PST

+ 2023-02-03 21:26:33 PST

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index a922df97e..0e4cc6893 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-30 14:45:57 PST

+ 2023-02-03 21:26:33 PST

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 074a8f28c..f83a95597 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-30 14:45:56 PST

+ 2023-02-03 21:26:32 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 0cbd88b76..05ae2d579 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-30 14:45:56 PST

+ 2023-02-03 21:26:32 PST

 </div>

 </div>

 </body>