Merge branch 'ps/pathspec-empty-prefix-origin'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Apr 2017 06:39:03 +0000 (15:39 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Apr 2017 06:39:03 +0000 (15:39 +0900)
A recent update broke "git add -p ../foo" from a subdirectory.

* ps/pathspec-empty-prefix-origin:
pathspec: honor `PATHSPEC_PREFIX_ORIGIN` with empty prefix

1  2 
pathspec.c
diff --cc pathspec.c
Simple merge