summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:15 -0800
committerJunio C Hamano <gitster@pobox.com>2017-01-18 15:12:15 -0800
commit00880a17dd1ccad44150c425d5709b767c9326bc (patch)
tree327f0503a8f7b65906d1b847166bdbee1afa616c /merge.c
parentc7f352f31ad0593f7772a155980b16cbbaac3dec (diff)
parent2d81c48fa7f7679a92c9fe674b53656166ade4f8 (diff)
downloadgit-00880a17dd1ccad44150c425d5709b767c9326bc.tar.gz
Merge branch 'sb/pathspec-errors'
Running "git add a/b" when "a" is a submodule correctly errored out, but without a meaningful error message. * sb/pathspec-errors: pathspec: give better message for submodule related pathspec error
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions