From: Taylor Blau <me@ttaylorr.com>
Date: Tue, 18 Mar 2025 22:54:44 +0000 (-0400)
Subject: pseudo-merge.h: fix a typo
X-Git-Tag: v2.50.0-rc0~145^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c000918eb756cccc76780dc4d37645eaa5d12f02;p=thirdparty%2Fgit.git

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>
---

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);