summaryrefslogtreecommitdiff
path: root/Documentation/technical
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
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')
-rw-r--r--Documentation/technical/index-format.txt2
-rw-r--r--Documentation/technical/racy-git.txt2
2 files changed, 2 insertions, 2 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
diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt
index f716d6d..242a044 100644
--- a/Documentation/technical/racy-git.txt
+++ b/Documentation/technical/racy-git.txt
@@ -46,7 +46,7 @@ because in-core timestamps can have finer granularity than
on-disk timestamps, resulting in meaningless changes when an
inode is evicted from the inode cache. See commit 8ce13b0
of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
-([PATCH] Sync in core time granuality with filesystems,
+([PATCH] Sync in core time granularity with filesystems,
2005-01-04).
Racy Git