Merge branch 'jk/format-patch-from'
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:55:18 +0000 (17 15:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:55:18 +0000 (17 15:55 -0700)
"format-patch --from=<whom>" forgot to omit unnecessary in-body
from line, i.e. when <whom> is the same as the real author.

* jk/format-patch-from:
  format-patch: print in-body "From" only when needed

1  2 
cache.h

diff --cc cache.h
Simple merge