kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'tb/bitamp-typofix' 

Typofix.

* tb/bitamp-typofix:
  pseudo-merge.h: fix a typo
maint
Junio C Hamano 2025-04-07 14:23:20 -07:00
parent 3bc7f869f0 c000918eb7
commit 97b747ca11
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pseudo-merge.h
View File

@ -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 * 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 pseudo_merge *pseudo_merge_for_parents(const struct pseudo_merge_map *pm,
struct bitmap *parents); struct bitmap *parents);