関連ワード:  git merge without extra commit    git merge without commit history  
結果 : git merge without extra commit