Merge branch 'fp/submodule-checkout-mode'

diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index 0810251f5a316de548d906bde65fba5af3507e4d..f352a9b22e3138fa674c393d99d420de4f2ff144 100644 (file)
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -175,7 +175,7 @@ Git index format
 
   A conflict is represented in the index as a set of higher stage entries.
   When a conflict is resolved (e.g. with "git add path"), these higher
-  stage entries will be removed and a stage-0 entry with proper resoluton
+  stage entries will be removed and a stage-0 entry with proper resolution
   is added.
 
   When these higher stage entries are removed, they are saved in the