Merge branch 'jc/maint-diff-patch-header'
commit239d6eddcd9a260c25104aa9679252016a86900a
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:07 +0000 (6 14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:07 +0000 (6 14:53 -0800)
tree2d599cf5076a10469218676d1a5575a1b594ff74
parentf4464a3b7c9319011acf7b813b0217e244f4954e
parentb3f01ff29f7131e959bcfdfd004744d74d5fa319
Merge branch 'jc/maint-diff-patch-header'

By Junio C Hamano
* jc/maint-diff-patch-header:
  diff -p: squelch "diff --git" header for stat-dirty paths
  t4011: illustrate "diff-index -p" on stat-dirty paths
  t4011: modernise style
diff.c