Merge branch 'nd/magic-pathspec'
commite2bcd4f77968e075c2987da020ba7a843007a54f
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Dec 2013 19:08:03 +0000 (6 11:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Dec 2013 19:09:41 +0000 (6 11:09 -0800)
tree05619481a0da9f803f4010f1077aae7e3be37bb9
parentcb6bd5722f430b225b894920fd80975ffa1d0bb5
parent887c6c18ba84da8d722b1528fe8cdde65d9f9860
Merge branch 'nd/magic-pathspec'

"git diff -- ':(icase)makefile'" were rejected unnecessarily.
This needs to be merged to 'maint' later.

* nd/magic-pathspec:
  diff: restrict pathspec limitations to diff b/f case only
builtin/diff.c