From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Aug 2015 22:07:52 +0000 (-0700)
Subject: Merge branch 'ta/docfix-index-format-tech'
X-Git-Tag: v2.6.0-rc0~68
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2e8ef44ee5e6229fa9b54a7ce7b0dca6910af749?hp=-c

Merge branch 'ta/docfix-index-format-tech'

* ta/docfix-index-format-tech:
typofix for index-format.txt
---

2e8ef44ee5e6229fa9b54a7ce7b0dca6910af749
diff --combined Documentation/technical/index-format.txt
index b7093af8b2,aee7946e08..7392ff636c
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@@ -242,10 -242,6 +242,10 @@@ Git index forma
  
    The extension starts with
  
 +  - A sequence of NUL-terminated strings, preceded by the size of the
 +    sequence in variable width encoding. Each string describes the
 +    environment where the cache can be used.
 +
    - Stat data of $GIT_DIR/info/exclude. See "Index entry" section from
      ctime field until "file size".
  
@@@ -275,7 -271,7 +275,7 @@@
  
      - 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: