]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commitc000918eb756cccc76780dc4d37645eaa5d12f02
tree7a19e1e3b8d6db0789fbed776cdb5dc73acf62b2
parent5c21db3a0d5f4414b65e114ca21c5a1fe736f2bc
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>
pseudo-merge.h