summaryrefslogtreecommitdiffstats
path: root/combine-diff.c
diff options
context:
space:
mode:
authorPavel Roskin <proski@gnu.org>2006-07-10 07:50:18 +0200
committerJunio C Hamano <junkio@cox.net>2006-07-10 09:36:44 +0200
commit82e5a82fd73edb80a841f5fab1660e14b9b8f3ad (patch)
tree9661cdf47ee3bf69192ff336e0514fc6dd607728 /combine-diff.c
parentgitweb.cgi: Teach "a=blob" action to know the blob/file mime type (diff)
downloadgit-82e5a82fd73edb80a841f5fab1660e14b9b8f3ad.tar.xz
git-82e5a82fd73edb80a841f5fab1660e14b9b8f3ad.zip
Fix more typos, primarily in the code
The only visible change is that git-blame doesn't understand "--compability" anymore, but it does accept "--compatibility" instead, which is already documented. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c
index caffb926ea..1bc1484645 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -320,7 +320,7 @@ static int give_context(struct sline *sline, unsigned long cnt, int num_parent)
unsigned long i;
/* Two groups of interesting lines may have a short gap of
- * unintersting lines. Connect such groups to give them a
+ * uninteresting lines. Connect such groups to give them a
* bit of context.
*
* We first start from what the interesting() function says,