関連ワード:  git merge with commit history    git merge without commit history    git merge keep commit history    git merge ignore commit history    git merge commit with semi linear history    git merge commit log    git merge branch without commit history    git merge vs rebase commit history    git merge changes without commit history