diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-13 00:54:01 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-13 00:54:01 +0400 |
| commit | caa7d79f1f7c9940acfaf161b9b84bbf81980d95 (patch) | |
| tree | bbfbe6ac84575766b4752e48960d12288a8b6c42 /commit.c | |
| parent | e2af9e361b1d7452492baa073790b19292f9c038 (diff) | |
| parent | a46221e9adcf3deb88c4fc904859205bf87f784c (diff) | |
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.c')
| -rw-r--r-- | commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -841,7 +841,7 @@ struct commit_list *get_merge_bases(struct commit *one, struct commit *two, } /* - * Is "commit" a decendant of one of the elements on the "with_commit" list? + * Is "commit" a descendant of one of the elements on the "with_commit" list? */ int is_descendant_of(struct commit *commit, struct commit_list *with_commit) { |