関連ワード:  git merge continue without pre-commit    git merge without commit history    git merge changes without commit history  
結果 : git merge continue without pre-commit