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

* cb/partial-commit-relative-pathspec:
  commit: allow partial commits with relative paths

diff --cc cache.h
Simple merge

diff --cc setup.c
Simple merge