diff options
| author | Jeff King <peff@peff.net> | 2012-10-25 06:41:57 -0400 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-25 06:41:57 -0400 |
| commit | 8de8f9f656696a3c04e5f0a274b57e4a719a66ce (patch) | |
| tree | 181e8f9626ed245aab923a60294085ffd368cc55 /Documentation | |
| parent | 55ff63007509d075d32861ff48cc8bb57d445b2a (diff) | |
| parent | 50fb51e7e81748182a770d3943ec5730357b27e7 (diff) | |
| download | git-8de8f9f656696a3c04e5f0a274b57e4a719a66ce.tar.gz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 67a90a828c..75ab8a51ca 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -56,6 +56,10 @@ diff.statGraphWidth:: Limit the width of the graph part in --stat output. If set, applies to all commands generating --stat output except format-patch. +diff.context:: + Generate diffs with <n> lines of context instead of the default of + 3. This value is overridden by the -U option. + diff.external:: If this config variable is set, diff generation is not performed using the internal diff machinery, but using the |