Mention that pull can work locally in the synopsis

[git.git] / Documentation / git-diff.txt

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 7267bcd7a015291bece97460b9c81f8ace85c990..228c4d95bd41d40bbb32cfcb6b9a7dc648280fa5 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -8,24 +8,24 @@ git-diff - Show changes between commits, commit and working tree, etc
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
+'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...]

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

-Show changes between two ents, an ent and the working tree, an
-ent and the index file, or the index file and the working tree.
+Show changes between two trees, a tree and the working tree, a
+tree and the index file, or the index file and the working tree.

 The combination of what is compared with what is determined by
 The combination of what is compared with what is determined by

-the number of ents given to the command.
+the number of trees given to the command.

 
 

-* When no <ent> is given, the working tree and the index
-  file is compared, using `git-diff-files`.
+* When no <tree-ish> is given, the working tree and the index
+  file are compared, using `git-diff-files`.

 
 

-* When one <ent> is given, the working tree and the named
-  tree is compared, using `git-diff-index`.  The option
+* When one <tree-ish> is given, the working tree and the named
+  tree are compared, using `git-diff-index`.  The option

   `--cached` can be given to compare the index file and
   the named tree.
 
   `--cached` can be given to compare the index file and
   the named tree.
 

-* When two <ent>s are given, these two trees are compared
+* When two <tree-ish>s are given, these two trees are compared

   using `git-diff-tree`.
 
 OPTIONS
   using `git-diff-tree`.
 
 OPTIONS


@@ -85,7 +85,7 @@ $ git diff arch/i386 include/asm-i386   <3>
 nor deletion.
 <2> show only names and the nature of change, but not actual
 diff output.  --name-status disables usual patch generation
 nor deletion.
 <2> show only names and the nature of change, but not actual
 diff output.  --name-status disables usual patch generation

-which in turn also disables recursive behaviour, so without -r
+which in turn also disables recursive behavior, so without -r

 you would only see the directory name if there is a change in a
 file in a subdirectory.
 <3> limit diff output to named subtrees.
 you would only see the directory name if there is a change in a
 file in a subdirectory.
 <3> limit diff output to named subtrees.