Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:47:23 +0000 (11:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Jun 2014 18:47:23 +0000 (11:47 -0700)
commitcb4575fb181c418a85231ec962c01ef314ec9dfc
treec7de9dc84fd9a533b7b22be1e08c4c014f7ed452
parent11aae3e1c17bca8e7057d99a071815ee3c526d16
parentdd63f169d9381a77db469325688a2bef1a79a9e1
Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint

"git format-patch" did not enforce the rule that the "--follow"
option from the log/diff family of commands must be used with
exactly one pathspec.

* jk/diff-follow-must-take-one-pathspec:
  move "--follow needs one pathspec" rule to diff_setup_done
builtin/log.c
diff.c