Autogenerated HTML docs for v2.30.0-rc0-82-gba2aa

20 files changed, 38 insertions, 32 deletions

diff --git a/RelNotes/2.30.0.txt b/RelNotes/2.30.0.txt
index df8df8a5d..16955c7e3 100644
--- a/RelNotes/2.30.0.txt
+++ b/RelNotes/2.30.0.txt
@@ -391,3 +391,5 @@ Fixes since v2.29
    (merge 08e9df2395 jk/multi-line-indent-style-fix later to maint).
    (merge e66590348a da/vs-build-iconv-fix later to maint).
    (merge 7fe07275be js/cmake-extra-built-ins-fix later to maint).
+   (merge 633eebe142 jb/midx-doc-update later to maint).
+   (merge 5885367e8f jh/index-v2-doc-on-fsmn later to maint).
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index e7f8df37d..d242b88c9 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

- 2020-12-14 11:14:21 PST

+ 2020-12-17 15:42:30 PST

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index afd0af1f3..0a04e2f93 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

- 2020-12-14 11:14:22 PST

+ 2020-12-17 15:42:30 PST

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index efed8f568..2a351c9ee 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

- 2020-12-14 11:14:16 PST

+ 2020-12-17 15:42:26 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 52005434b..634366d6f 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

- 2020-12-14 11:14:21 PST

+ 2020-12-17 15:42:29 PST

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 803324a51..c5cf64607 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

- 2020-12-14 11:14:21 PST

+ 2020-12-17 15:42:29 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 836f0e364..0c35c768e 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

- 2020-12-14 11:14:21 PST

+ 2020-12-17 15:42:29 PST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 1645d7a7c..042598680 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

- 2020-12-14 11:14:21 PST

+ 2020-12-17 15:42:29 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 75e05b77a..228b2d8f4 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

- 2020-12-14 11:14:20 PST

+ 2020-12-17 15:42:28 PST

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 7cf09a9e1..bb47e03a6 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

- 2020-12-14 11:14:17 PST

+ 2020-12-17 15:42:26 PST

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 17d1bbbd3..2bcd7cc26 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

- 2020-12-14 11:14:19 PST

+ 2020-12-17 15:42:28 PST

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 2846214f4..5004f906f 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

- 2020-12-14 11:14:19 PST

+ 2020-12-17 15:42:28 PST

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 7207cd527..a1c17e977 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

- 2020-12-14 11:14:18 PST

+ 2020-12-17 15:42:28 PST

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 1de385208..3d1791af3 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

- 2020-12-14 11:14:18 PST

+ 2020-12-17 15:42:27 PST

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index f1fd69f1f..323ff4f9f 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

- 2020-12-14 11:14:17 PST

+ 2020-12-17 15:42:27 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 c1f3486cc..a6d171c2e 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

- 2020-12-14 11:14:17 PST

+ 2020-12-17 15:42:27 PST

 </div>

 </div>

 </body>

diff --git a/technical/index-format.html b/technical/index-format.html
index edca07ec4..eb8c11d13 100644
--- a/technical/index-format.html
+++ b/technical/index-format.html
@@ -1293,18 +1293,27 @@ hook has told us about changes.  The signature for this extension is
 <div class="ulist"><ul>

 <li>

 <p>

-32-bit version number: the current supported version is 1.

+32-bit version number: the current supported versions are 1 and 2.

 </p>

 </li>

 <li>

 <p>

-64-bit time: the extension data reflects all changes through the given

+(Version 1)

+    64-bit time: the extension data reflects all changes through the given

         time which is stored as the nanoseconds elapsed since midnight,

         January 1, 1970.

 </p>

 </li>

 <li>

 <p>

+(Version 2)

+    A null terminated string: an opaque token defined by the file system

+    monitor application.  The extension data reflects all changes relative

+    to that token.

+</p>

+</li>

+<li>

+<p>

 32-bit bitmap size: the size of the CE_FSMONITOR_VALID bitmap.

 </p>

 </li>

@@ -1403,7 +1412,7 @@ A number of index offset entries each consisting of:
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-19 16:37:10 PDT

+ 2020-12-17 15:41:40 PST

 </div>

 </div>

 </body>

diff --git a/technical/index-format.txt b/technical/index-format.txt
index f9a364471..69edf46c0 100644
--- a/technical/index-format.txt
+++ b/technical/index-format.txt
@@ -306,12 +306,18 @@ The remaining data of each directory block is grouped by type:
 
   The extension starts with
 
-  - 32-bit version number: the current supported version is 1.
+  - 32-bit version number: the current supported versions are 1 and 2.
 
-  - 64-bit time: the extension data reflects all changes through the given
+  - (Version 1)
+    64-bit time: the extension data reflects all changes through the given
 	time which is stored as the nanoseconds elapsed since midnight,
 	January 1, 1970.
 
+  - (Version 2)
+    A null terminated string: an opaque token defined by the file system
+    monitor application.  The extension data reflects all changes relative
+    to that token.
+
   - 32-bit bitmap size: the size of the CE_FSMONITOR_VALID bitmap.
 
   - An ewah bitmap, the n-th bit indicates whether the n-th index entry
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html
index d2710d522..ca36f80ec 100644
--- a/technical/multi-pack-index.html
+++ b/technical/multi-pack-index.html
@@ -850,13 +850,6 @@ The MIDX file format uses a chunk-based approach (similar to the
 <div class="ulist"><ul>

 <li>

 <p>

-Add a <em>verify</em> subcommand to the <em>git midx</em> builtin to verify the

-  contents of the multi-pack-index file match the offsets listed in

-  the corresponding pack-indexes.

-</p>

-</li>

-<li>

-<p>

 The multi-pack-index allows many packfiles, especially in a context

   where repacking is expensive (such as a very large repo), or

   unexpected maintenance time is unacceptable (such as a high-demand

@@ -919,7 +912,7 @@ The partial clone feature records special "promisor" packs that
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-03-10 08:03:13 PDT

+ 2020-12-17 15:41:40 PST

 </div>

 </div>

 </body>

diff --git a/technical/multi-pack-index.txt b/technical/multi-pack-index.txt
index 4e7631437..e8e377a59 100644
--- a/technical/multi-pack-index.txt
+++ b/technical/multi-pack-index.txt
@@ -60,10 +60,6 @@ Design Details
 Future Work
 -----------
 
-- Add a 'verify' subcommand to the 'git midx' builtin to verify the
-  contents of the multi-pack-index file match the offsets listed in
-  the corresponding pack-indexes.
-
 - The multi-pack-index allows many packfiles, especially in a context
   where repacking is expensive (such as a very large repo), or
   unexpected maintenance time is unacceptable (such as a high-demand