関連ワード:  commit merge vs rebase    merge commit vs rebase github    merge commit or rebase    git merge commit vs rebase    merge commit vs rebase vs squash    update with merge commit vs rebase    create a merge commit vs rebase    merge vs rebase commit history    git merge vs rebase commit history    update branch with merge commit vs rebase