@cesarb hmm, good point git am en masse followed by a rebase. If you also did a git am of your own patches in addition to the other persons's