diff options
| author | Samuel Bronson <naesten@gmail.com> | 2013-12-18 19:08:12 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-18 16:39:00 -0800 |
| commit | 6d8940b562adc5e43068868109dffe1b9bff7f78 (patch) | |
| tree | ed16e6a73761475bbc567340b721a0fdca36ac4a /Documentation/diff-config.txt | |
| parent | a21bae33d9e13c59217639b866355f1a02211a2c (diff) | |
| download | git-6d8940b562adc5e43068868109dffe1b9bff7f78.tar.gz git-6d8940b562adc5e43068868109dffe1b9bff7f78.tar.xz | |
diff: add diff.orderfile configuration variable
diff.orderfile acts as a default for the -O command line option.
[sb: split up aw's original patch; rework tests and docs, treat option
as pathname]
Signed-off-by: Anders Waldenborg <anders@0x63.nu>
Signed-off-by: Samuel Bronson <naesten@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-config.txt')
| -rw-r--r-- | Documentation/diff-config.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 223b9310d..f07b4513e 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -98,6 +98,11 @@ diff.mnemonicprefix:: diff.noprefix:: If set, 'git diff' does not show any source or destination prefix. +diff.orderfile:: + File indicating how to order files within a diff, using + one shell glob pattern per line. + Can be overridden by the '-O' option to linkgit:git-diff[1]. + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the 'git diff' option '-l'. |