I have two commits based on some parent: P -> A -> B
I'd like for them to be based on another parent: P' -> A' -> B'
My situation is that I'm working with other team members. We have a central git repository. In my configuration, 'git pull' does rebase while for the others it creates a merge. Every now and then, when I issue 'git pull', git starts rebasing commits that I didn't do and I need to resolve conflicts for code I didn't write. This is long and error prone.
I assume the reason is that something similar to this happens:
/--A--B---- // my repository / --C1--C2--------M- // the remote \ M / \-D-M'-E--/ // another developer
So a developer merges C2 and then pushes his changes which makes git think some commits are new (my guess only). What I end up with is having to rebase other people commits.