関連ワード:  git merge branch until commit    git merge branch before commit    git merge without deleting branch  
結果 : git merge branch until commit