Merge branch 'nd/magic-pathspec' into maint
commitc8b928d7700b581118a7a1beb957184fcbe57d06
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:21:34 +0000 (17 11:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Dec 2013 19:21:34 +0000 (17 11:21 -0800)
treedeef37f7c08ddbe4b3424f499dd60785940805a9
parent3e7b066e2229f45d633164beaeb8815b0973a9b4
parent887c6c18ba84da8d722b1528fe8cdde65d9f9860
Merge branch 'nd/magic-pathspec' into maint

"git diff -- ':(icase)makefile'" was unnecessarily rejected at the
command line parser.

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