Git Merge Commits Locally