summaryrefslogtreecommitdiff
path: root/Documentation/technical/index-format.txt
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2013-07-22 21:02:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-22 23:06:48 (GMT)
commit17b83d71d52a5eb6a621be22daa624414d3ee514 (patch)
tree2d55c178ce0711b08eef3a4e9886606954cfbf27 /Documentation/technical/index-format.txt
parent1114fc023772001bb7053789461c69b0c3c994e3 (diff)
downloadgit-17b83d71d52a5eb6a621be22daa624414d3ee514.zip
git-17b83d71d52a5eb6a621be22daa624414d3ee514.tar.gz
git-17b83d71d52a5eb6a621be22daa624414d3ee514.tar.bz2
typofix: documentation
Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/index-format.txt')
-rw-r--r--Documentation/technical/index-format.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index 0810251..f352a9b 100644
--- 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