Git Merge Single Commit