Merge branch 'cb/partial-commit-relative-pathspec'