max.txt

A <- B <- C <- D <- E (master)

A <- B <- C (master)

A <- B <- C <- F <- G (feature)

rebase:

A <- B <- C <- D <- E <- F <- G (feature)

merge:

A <- B <- C <- F <- G <- D <- E (feature)


new master (with merge):
A <- B <- C <- D <- E <- H (master')

where H is a merge commit that brings in F and G from feature

A <- B <- C <- D <- E <- H (master)
           \ F <- G ----/

A <- B <- C <- D <- E <- F <- G (master)