diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-03-28 14:13:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-03-28 14:13:50 -0700 |
| commit | 396430b5a73f60acc2ce8365a9edfe6923014ca3 (patch) | |
| tree | f74eccaa536a7059547c585b9f95c3ede8540937 /Documentation/config | |
| parent | 1002f28a527d33893f7dab068dbac7011f84af65 (diff) | |
| parent | 178401dc25cf8c3f1a716b852b14dafa79367646 (diff) | |
| download | git-396430b5a73f60acc2ce8365a9edfe6923014ca3.tar.gz | |
Merge branch 'ph/diff-src-dst-prefix-config'
"git diff" and friends learned two extra configuration variables,
diff.srcPrefix and diff.dstPrefix.
* ph/diff-src-dst-prefix-config:
diff.*Prefix: use camelCase in the doc and test titles
diff: add diff.srcPrefix and diff.dstPrefix configuration variables
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/diff.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index 6c7e09a1ef..5ce7b91f1d 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -108,9 +108,15 @@ diff.mnemonicPrefix:: `git diff --no-index a b`;; compares two non-git things (1) and (2). -diff.noprefix:: +diff.noPrefix:: If set, 'git diff' does not show any source or destination prefix. +diff.srcPrefix:: + If set, 'git diff' uses this source prefix. Defaults to "a/". + +diff.dstPrefix:: + If set, 'git diff' uses this destination prefix. Defaults to "b/". + diff.relative:: If set to 'true', 'git diff' does not show changes outside of the directory and show pathnames relative to the current directory. |