Merge branch 'rr/submodule-diff-config'
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Nov 2012 02:44:50 +0000 (18:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Nov 2012 02:44:50 +0000 (18:44 -0800)
Allow "git diff --submodule=log" to set to be the default via
configuration.

* rr/submodule-diff-config:
  submodule: display summary header in bold
  diff: rename "set" variable
  diff: introduce diff.submodule configuration variable
  Documentation: move diff.wordRegex from config.txt to diff-config.txt

1  2 
diff.c

diff --cc diff.c
Simple merge