Merge branch 'jk/diff-follow-must-take-one-pathspec' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:33:52 +0000 (13:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jun 2014 20:33:53 +0000 (13:33 -0700)
commit0cd28d72323112449ecfacfe345eabc8c58842f1
tree54ffd64920319540d1d17565c2b40629ca2bbe42
parent3598cc6ed3647882ee4477a987828677eaaa3be1
parentdd63f169d9381a77db469325688a2bef1a79a9e1
Merge branch 'jk/diff-follow-must-take-one-pathspec' into next

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