4 ms·
> If a commit has multiple parents, … git rebase, I think implicitly assumes the first parent. `git rebase`'s behavior regarding merge commits is shockingly co
by LukeShu 6y ago
> If a commit has multiple parents, … git rebase, I think implicitly assumes the first parent.
`git rebase`'s behavior regarding merge commits is shockingly complicated, but much of the time: Because by default it linearizes the history, it actually just skips merge commits because it assumes that the merge has already happened implicitly by applying one of the merge's parents on top of the other parent.