Git Merge Single Commitment