Merge two commits using git rebase.