Git Merge Command Line