]> git.ipfire.org Git - thirdparty/git.git/commitdiff
pseudo-merge.h: fix a typo
authorTaylor Blau <me@ttaylorr.com>
Tue, 18 Mar 2025 22:54:44 +0000 (18:54 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Mar 2025 08:47:07 +0000 (01:47 -0700)
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>
pseudo-merge.h

index 2aca01d056666e4341a773888f843616751d475e..598a3fdb27d3ec91a3fe7798886c5329c6b8e71b 100644 (file)
@@ -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);