Git Merge From Command Line