summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-12 13:54:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-12 13:54:01 -0700
commitcaa7d79f1f7c9940acfaf161b9b84bbf81980d95 (patch)
treebbfbe6ac84575766b4752e48960d12288a8b6c42 /commit.h
parentMerge branch 'maint' (diff)
parentMerge branch 'rr/test-3200-style' into maint (diff)
downloadtgif-caa7d79f1f7c9940acfaf161b9b84bbf81980d95.tar.xz
Sync with 'maint'
* maint: Correct common spelling mistakes in comments and tests kwset: fix spelling in comments precompose-utf8: fix spelling of "want" in error message compat/nedmalloc: fix spelling in comments compat/regex: fix spelling and grammar in comments obstack: fix spelling of similar contrib/subtree: fix spelling of accidentally git-remote-mediawiki: spelling fixes doc: various spelling fixes fast-export: fix argument name in error messages Documentation: distinguish between ref and offset deltas in pack-format i18n: make the translation of -u advice in one go
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/commit.h b/commit.h
index 87b4b6cc0c..057ff8045e 100644
--- a/commit.h
+++ b/commit.h
@@ -166,7 +166,7 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *r
extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
-/* largest postive number a signed 32-bit integer can contain */
+/* largest positive number a signed 32-bit integer can contain */
#define INFINITE_DEPTH 0x7fffffff
extern int register_shallow(const unsigned char *sha1);