changing --theirs default to  in git rebase