Merge branch 'jh/index-v2-doc-on-fsmn'

[thirdparty/git.git] / Documentation / technical / index-format.txt

diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index f9a3644711b903336587333923a0203fa5fe9d86..69edf46c031683a7288ec5efd3aaf499fb8bda55 100644 (file)
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/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