Merge branch 'cc/trailers-corner-case-fix' into maint

diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index b7093af8b23e6a83741b81678e7aae0c5ff7c88a..7392ff636c6dda148b41993448f4a5589f66938c 100644 (file)
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -275,7 +275,7 @@ Git index format
 
     - The directory name terminated by NUL.
 
-    - A number of untrached file/dir names terminated by NUL.
+    - A number of untracked file/dir names terminated by NUL.
 
 The remaining data of each directory block is grouped by type: