Git Rebase Without Merge Commit