Re: git merge/rebase ref -P ref

ryenus writes: > The inverted meaning of {ours,theirs} for rebase could be very > confusing to some, especially to new uses, for me every time I > merge/rebase I need to think about it to make sure I've made it right. The key point to remember is "git rebase origin master" is *not* about integra

git merge/rebase ref -P ref

The inverted meaning of {ours,theirs} for rebase could be very confusing to some, especially to new uses, for me every time I merge/rebase I need to think about it to make sure I've made it right. What about making it more intuitive? We can and a new option (like '-P') for people to specify the p