| commit | 355319ebefc423c9525493703ee0693f00e502b3 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Nov 2012 23:20:09 +0000 (19 15:20 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 19 Nov 2012 23:20:09 +0000 (19 15:20 -0800) | ||
| tree | 6b36f21453f254c08b2b73c2cae94a497f3f9792 | treesnapshot (tar.gz zip) |
| parent | 6bcca4c1445adb7d1772b35a57a5d210c4bdc9f4 | commitdiff |
| parent | 4e215131d2543a28a065c5161438c315316f9961 | commitdiff |
Merge branch 'rr/submodule-diff-config' into next
Lets "git diff --submodule=log" become 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
Lets "git diff --submodule=log" become 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
| diff.c | diff1 | diff2 | blobhistory |