Hi Sebastian, On Wed, 30 Aug 2017, Sebastian Schuberth wrote: > I believe stumbled upon a nasty bug in Git: It looks like a commits gets > dropped during interactive rebase when asking to preserve merges. Please see 'exchange two commits with -p' in t3404. This is a known breakage, and due to the fact that -p and -i are fundamentally incompatible with one another (even if -p's implementation was based on -i's). I never had in mind for -p to be allowed together with -i, and was against allowing it because of the design. Short version: do not use -p with -i. Ciao, Johannes
