| commit | be95387af2820b039d81d121ac2a74fdf9238073 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Nov 2012 02:44:50 +0000 (25 18:44 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Nov 2012 02:44:50 +0000 (25 18:44 -0800) | ||
| tree | db9e2f31602be444238bb0da7ed2ee89cb3c6d13 | treesnapshot (tar.gz zip) |
| parent | 5ab539bb005498bc3cbf37d57a939b809a1c3dbc | commitdiff |
| parent | 4e215131d2543a28a065c5161438c315316f9961 | commitdiff |
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
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
| diff.c | diff1 | diff2 | blobhistory |