diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:23:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 19:23:01 -0700 |
| commit | 0def7126fda12600017a1d8cd598ee0516cf60a2 (patch) | |
| tree | b6d32fc682657ea5511434178748a7a56a0f56bc /sha1_name.c | |
| parent | 4274cdf44a6f4929cdcec68b788d9a6991795ff4 (diff) | |
| parent | 749f763dbbe4dbcc4082f02bf98bfc1a09427c6f (diff) | |
| download | git-0def7126fda12600017a1d8cd598ee0516cf60a2.tar.gz | |
Merge branch 'ob/typofixes'
* ob/typofixes:
typofix: in-code comments
typofix: documentation
typofix: release notes
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index 0cf0c28a6f..1d210e3201 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -52,7 +52,7 @@ static void update_candidates(struct disambiguate_state *ds, const unsigned char } if (!ds->candidate_ok) { - /* discard the candidate; we know it does not satisify fn */ + /* discard the candidate; we know it does not satisfy fn */ hashcpy(ds->candidate, current); ds->candidate_checked = 0; return; |