diff options
Diffstat (limited to 'man1/git-diff.1')
| -rw-r--r-- | man1/git-diff.1 | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 3c2e32786..ed7d7d70c 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: 10/21/2022 +.\" Date: 10/26/2022 .\" Manual: Git Manual -.\" Source: Git 2.38.1.143.g1fc3c0ad40 +.\" Source: Git 2.38.1.175.gdb29e6bbae .\" Language: English .\" -.TH "GIT\-DIFF" "1" "10/21/2022" "Git 2\&.38\&.1\&.143\&.g1fc3c0" "Git Manual" +.TH "GIT\-DIFF" "1" "10/26/2022" "Git 2\&.38\&.1\&.175\&.gdb29e6" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -92,14 +92,15 @@ is equivalent to .PP \fIgit diff\fR [<options>] <commit> <commit>\&... <commit> [\-\-] [<path>\&...] .RS 4 -This form is to view the results of a merge commit\&. The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents\&. A convenient way to produce the desired set of revisions is to use the +This form is to view the results of a merge commit\&. The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents\&. Convenient ways to produce the desired set of revisions are to use the suffixes \fB^@\fR -suffix\&. For instance, if -\fBmaster\fR -names a merge commit, -\fBgit diff master master^@\fR -gives the same combined diff as -\fBgit show master\fR\&. +and +\fB^!\fR\&. If A is a merge commit, then +\fBgit diff A A^@\fR, +\fBgit diff A^!\fR +and +\fBgit show A\fR +all give the same combined diff\&. .RE .PP \fIgit diff\fR [<options>] <commit>\&.\&.<commit> [\-\-] [<path>\&...] |