From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Nov 2012 02:44:50 +0000 (-0800)
Subject: Merge branch 'rr/submodule-diff-config'
X-Git-Tag: v1.8.1-rc0~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be95387af2820b039d81d121ac2a74fdf9238073;p=thirdparty%2Fgit.git

Merge branch 'rr/submodule-diff-config'

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
---

be95387af2820b039d81d121ac2a74fdf9238073