Merge branch 'jk/diff-follow-must-take-one-pathspec'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 17:07:09 +0000 (10:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Jun 2014 17:07:09 +0000 (10:07 -0700)
commitb0e2c999af7aa69a0b8d9677107d4c09938e528a
treefb8ea45a1fb8ea9a9cd1f75e0650da53e9316ded
parentb83163643bd7459385003fa58ae049a31f2984cb
parentdd63f169d9381a77db469325688a2bef1a79a9e1
Merge branch 'jk/diff-follow-must-take-one-pathspec'

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