diff options
Diffstat (limited to 'man1/git-diff.1')
| -rw-r--r-- | man1/git-diff.1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 5b37fcc0b..5a51b4f65 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: 2023-12-20 +.\" Date: 2023-12-27 .\" Manual: Git Manual -.\" Source: Git 2.43.0.174.g055bb6e996 +.\" Source: Git 2.43.0.232.ge79552d197 .\" Language: English .\" -.TH "GIT\-DIFF" "1" "2023\-12\-20" "Git 2\&.43\&.0\&.174\&.g055bb6" "Git Manual" +.TH "GIT\-DIFF" "1" "2023\-12\-27" "Git 2\&.43\&.0\&.232\&.ge79552" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -117,7 +117,7 @@ is equivalent to \fBgit diff $(git merge\-base A B) B\fR\&. You can omit any one of <commit>, which has the same effect as using HEAD instead\&. .RE .sp -Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the \fB\-\-merge\-base\fR case and in the last two forms that use \fB\&.\&.\fR notations, can be any <tree>\&. A tree of interest is the one pointed to by the special ref \fBAUTO_MERGE\fR, which is written by the \fIort\fR merge strategy upon hitting merge conflicts (see \fBgit-merge\fR(1))\&. Comparing the working tree with \fBAUTO_MERGE\fR shows changes you\(cqve made so far to resolve textual conflicts (see the examples below)\&. +Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the \fB\-\-merge\-base\fR case and in the last two forms that use \fB\&.\&.\fR notations, can be any <tree>\&. A tree of interest is the one pointed to by the ref named \fBAUTO_MERGE\fR, which is written by the \fIort\fR merge strategy upon hitting merge conflicts (see \fBgit-merge\fR(1))\&. Comparing the working tree with \fBAUTO_MERGE\fR shows changes you\(cqve made so far to resolve textual conflicts (see the examples below)\&. .sp For a more complete list of ways to spell <commit>, see "SPECIFYING REVISIONS" section in \fBgitrevisions\fR(7)\&. However, "diff" is about comparing two \fIendpoints\fR, not ranges, and the range notations (\fB<commit>\&.\&.<commit>\fR and \fB<commit>\&.\&.\&.<commit>\fR) do not mean a range as defined in the "SPECIFYING RANGES" section in \fBgitrevisions\fR(7)\&. .PP |