Git Merge One Commit