diff options
Diffstat (limited to 'man1/git-diff.1')
| -rw-r--r-- | man1/git-diff.1 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/man1/git-diff.1 b/man1/git-diff.1 index c1085103c..31d59bba0 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-06-13 +.\" Date: 2023-06-23 .\" Manual: Git Manual -.\" Source: Git 2.41.0.28.gd7d8841f67 +.\" Source: Git 2.41.0.191.g6ff334181c .\" Language: English .\" -.TH "GIT\-DIFF" "1" "2023\-06\-13" "Git 2\&.41\&.0\&.28\&.gd7d8841" "Git Manual" +.TH "GIT\-DIFF" "1" "2023\-06\-23" "Git 2\&.41\&.0\&.191\&.g6ff334" "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>\&. +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)\&. .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 @@ -2032,6 +2032,7 @@ Various ways to check your working tree $ git diff \fB(1)\fR $ git diff \-\-cached \fB(2)\fR $ git diff HEAD \fB(3)\fR +$ git diff AUTO_MERGE \fB(4)\fR .fi .if n \{\ .RE @@ -2054,6 +2055,9 @@ T} Changes in the working tree since your last commit; what you would be committing if you run \fBgit commit \-a\fR T} +\fB4.\fR\h'-2n':T{ +Changes in the working tree you\(cqve made to resolve textual conflicts so far\&. +T} .TE .RE .PP |