diff options
| author | Taylor Blau <me@ttaylorr.com> | 2025-03-18 18:54:44 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-03-21 01:47:07 -0700 |
| commit | c000918eb756cccc76780dc4d37645eaa5d12f02 (patch) | |
| tree | 7a19e1e3b8d6db0789fbed776cdb5dc73acf62b2 | |
| parent | Git 2.46.3 (diff) | |
| download | git-c000918eb756cccc76780dc4d37645eaa5d12f02.tar.gz git-c000918eb756cccc76780dc4d37645eaa5d12f02.zip | |
pseudo-merge.h: fix a typo
The comment added in 7252d9a036 (pseudo-merge: implement support for
finding existing merges, 2024-05-23) misspells 'bitmap' as 'bitamp'.
Correct that so that we no longer have any stray "bitamps" lurking
throughout the tree:
$ git grep -ci bitamp | wc -l
0
Noticed-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | pseudo-merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pseudo-merge.h b/pseudo-merge.h index 2aca01d056..598a3fdb27 100644 --- a/pseudo-merge.h +++ b/pseudo-merge.h @@ -208,7 +208,7 @@ int cascade_pseudo_merges(const struct pseudo_merge_map *pm, /* * Returns a pseudo-merge which contains the exact set of commits - * listed in the "parents" bitamp, or NULL if none could be found. + * listed in the "parents" bitmap, or NULL if none could be found. */ struct pseudo_merge *pseudo_merge_for_parents(const struct pseudo_merge_map *pm, struct bitmap *parents); |