summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2006-07-09 07:44:30 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-09 09:42:41 (GMT)
commitaddf88e455f85bc6cfe0284b70aaad10b6d3486e (patch)
tree704e8b6de26fde0bff86618e363dbde9f70e1393 /Makefile
parent88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c (diff)
downloadgit-addf88e455f85bc6cfe0284b70aaad10b6d3486e.zip
git-addf88e455f85bc6cfe0284b70aaad10b6d3486e.tar.gz
git-addf88e455f85bc6cfe0284b70aaad10b6d3486e.tar.bz2
Assorted typo fixes
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 588d925..13f7c89 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ all:
# Define NO_ACCURATE_DIFF if your diff program at least sometimes misses
# a missing newline at the end of the file.
#
-# Define NO_PYTHON if you want to loose all benefits of the recursive merge.
+# Define NO_PYTHON if you want to lose all benefits of the recursive merge.
#
# Define COLLISION_CHECK below if you believe that SHA1's
# 1461501637330902918203684832716283019655932542976 hashes do not give you
@@ -469,7 +469,7 @@ ifdef NO_ACCURATE_DIFF
ALL_CFLAGS += -DNO_ACCURATE_DIFF
endif
-# Shell quote (do not use $(call) to accomodate ancient setups);
+# Shell quote (do not use $(call) to accommodate ancient setups);
SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))