diff options
Diffstat (limited to 'man1/git-diff.1')
| -rw-r--r-- | man1/git-diff.1 | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 8ab3ddebb..90f18cbc3 100644 --- a/man1/git-diff.1 +++ b/man1/git-diff.1 @@ -2,12 +2,12 @@ .\" Title: git-diff .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2024-03-25 +.\" Date: 2024-03-28 .\" Manual: Git Manual -.\" Source: Git 2.44.0.368.gc75fd8d815 +.\" Source: Git 2.44.0.413.gd6fd04375f .\" Language: English .\" -.TH "GIT\-DIFF" "1" "2024\-03\-25" "Git 2\&.44\&.0\&.368\&.gc75fd8" "Git Manual" +.TH "GIT\-DIFF" "1" "2024\-03\-28" "Git 2\&.44\&.0\&.413\&.gd6fd04" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -1027,8 +1027,13 @@ Do not show any source or destination prefix\&. .PP \-\-default\-prefix .RS 4 -Use the default source and destination prefixes ("a/" and "b/")\&. This is usually the default already, but may be used to override config such as -\fBdiff\&.noprefix\fR\&. +Use the default source and destination prefixes ("a/" and "b/")\&. This overrides configuration variables such as +\fBdiff\&.noprefix\fR, +\fBdiff\&.srcPrefix\fR, +\fBdiff\&.dstPrefix\fR, and +\fBdiff\&.mnemonicPrefix\fR +(see +\fBgit\-config\fR(1))\&. .RE .PP \-\-line\-prefix=<prefix> @@ -2342,13 +2347,27 @@ compares two non\-git things (1) and (2)\&. .RE .RE .PP -diff\&.noprefix +diff\&.noPrefix .RS 4 If set, \fIgit diff\fR does not show any source or destination prefix\&. .RE .PP +diff\&.srcPrefix +.RS 4 +If set, +\fIgit diff\fR +uses this source prefix\&. Defaults to "a/"\&. +.RE +.PP +diff\&.dstPrefix +.RS 4 +If set, +\fIgit diff\fR +uses this destination prefix\&. Defaults to "b/"\&. +.RE +.PP diff\&.relative .RS 4 If set to |