From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:28:11 +0000 (-0800)
Subject: Merge branch 'nd/split-index'
X-Git-Tag: v2.3.0-rc0~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/63903d0e4ec4e2895f2ce67980c89017fd62761d?hp=-c

Merge branch 'nd/split-index'

A typofix to the documentation of a feature already in the release.

* nd/split-index:
index-format.txt: add a missing closing quote
---

63903d0e4ec4e2895f2ce67980c89017fd62761d
diff --combined Documentation/technical/index-format.txt
index 1250b5ca8b,30442e5cec..35112e4966
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@@ -207,7 -207,7 +207,7 @@@ Git index forma
    in a separate file. This extension records the changes to be made on
    top of that to produce the final index.
  
-   The signature for this extension is { 'l', 'i, 'n', 'k' }.
+   The signature for this extension is { 'l', 'i', 'n', 'k' }.
  
    The extension consists of:
  
@@@ -231,5 -231,5 +231,5 @@@
      on. Replaced entries may have empty path names to save space.
  
    The remaining index entries after replaced ones will be added to the
 -  final index. These added entries are also sorted by entry namme then
 +  final index. These added entries are also sorted by entry name then
    stage.