| commit | 8de8f9f656696a3c04e5f0a274b57e4a719a66ce | |
| author | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 10:41:57 +0000 (25 06:41 -0400) | ||
| committer | Jeff King <peff@peff.net> | |
| Thu, 25 Oct 2012 10:41:57 +0000 (25 06:41 -0400) | ||
| tree | 181e8f9626ed245aab923a60294085ffd368cc55 | treesnapshot (tar.gz zip) |
| parent | 55ff63007509d075d32861ff48cc8bb57d445b2a | commitdiff |
| parent | 50fb51e7e81748182a770d3943ec5730357b27e7 | commitdiff |
Merge branch 'jm/diff-context-config'
Teaches a new configuration variable to "git diff" Porcelain and
its friends.
* jm/diff-context-config:
t4055: avoid use of sed 'a' command
diff: diff.context configuration gives default to -U
Teaches a new configuration variable to "git diff" Porcelain and
its friends.
* jm/diff-context-config:
t4055: avoid use of sed 'a' command
diff: diff.context configuration gives default to -U