* [PATCH] pseudo-merge.h: fix a typo
@ 2025-03-18 22:54 Taylor Blau
2025-03-19 14:21 ` Elijah Newren
0 siblings, 1 reply; 2+ messages in thread
From: Taylor Blau @ 2025-03-18 22:54 UTC (permalink / raw)
To: git; +Cc: Jeff King, Junio C Hamano
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>
---
pseudo-merge.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pseudo-merge.h b/pseudo-merge.h
index c9fbe9d312..cf0e62ecd1 100644
--- a/pseudo-merge.h
+++ b/pseudo-merge.h
@@ -210,7 +210,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);
base-commit: 683c54c999c301c2cd6f715c411407c413b1d84e
--
2.49.0.1.g3b3cc5c0fa
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] pseudo-merge.h: fix a typo
2025-03-18 22:54 [PATCH] pseudo-merge.h: fix a typo Taylor Blau
@ 2025-03-19 14:21 ` Elijah Newren
0 siblings, 0 replies; 2+ messages in thread
From: Elijah Newren @ 2025-03-19 14:21 UTC (permalink / raw)
To: Taylor Blau; +Cc: git, Jeff King, Junio C Hamano
On Tue, Mar 18, 2025 at 3:56 PM Taylor Blau <me@ttaylorr.com> wrote:
>
> 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:
Those poor bitamps; not being shown any love.
> $ git grep -ci bitamp | wc -l
> 0
>
> Noticed-by: Jeff King <peff@peff.net>
> Signed-off-by: Taylor Blau <me@ttaylorr.com>
> ---
> pseudo-merge.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/pseudo-merge.h b/pseudo-merge.h
> index c9fbe9d312..cf0e62ecd1 100644
> --- a/pseudo-merge.h
> +++ b/pseudo-merge.h
> @@ -210,7 +210,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);
>
> base-commit: 683c54c999c301c2cd6f715c411407c413b1d84e
> --
> 2.49.0.1.g3b3cc5c0fa
Simple clean-up; looks good.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-19 14:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-18 22:54 [PATCH] pseudo-merge.h: fix a typo Taylor Blau
2025-03-19 14:21 ` Elijah Newren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).