diff options
| author | Jeff Muizelaar <jmuizelaar@mozilla.com> | 2012-09-27 15:12:52 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-30 20:16:01 -0700 |
| commit | 6468a4e5486d01e4da5ea8e8f2990523c3d18688 (patch) | |
| tree | ab54a578966fcf48d31fda77f716048b4ba3ae87 /Documentation/diff-config.txt | |
| parent | 652398a88e7c3d18b6820a2ae369b05d26dc757f (diff) | |
| download | git-6468a4e5486d01e4da5ea8e8f2990523c3d18688.tar.gz git-6468a4e5486d01e4da5ea8e8f2990523c3d18688.tar.xz | |
diff: diff.context configuration gives default to -U
Introduce a configuration variable diff.context that tells
Porcelain commands to use a non-default number of context
lines instead of 3 (the default). With this variable, users
do not have to keep repeating "git log -U8" from the command
line; instead, it becomes sufficient to say "git config
diff.context 8" just once.
Signed-off-by: Jeff Muizelaar <jmuizelaar@mozilla.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-config.txt')
| -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 67a90a828..75ab8a51c 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 |