summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-12-20 14:41:54 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-12-20 14:41:54 -0800
commitce0545455a09113a8ece8f80c87ec61110569940 (patch)
treece06e56d55951d9958b67452f6b4e9f1ca8b0e26
parentMerge branch 'jc/leftright' (diff)
downloadtgif-ce0545455a09113a8ece8f80c87ec61110569940.tar.xz
diff documentation: mostly talk about <commit>
This corrects minor remaining bits that still talked about <tree-ish>; the Porcelain users (as opposed to plumbers) are mostly interested in commits so use <commit> consistently and keep a sentence that mentions that <tree-ish> can be used in place of them.
-rw-r--r--Documentation/git-diff.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 10fdf88dce..8977877b21 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc
SYNOPSIS
--------
-'git-diff' [ --diff-options ] <tree-ish>{0,2} [--] [<path>...]
+'git-diff' [ --diff-options ] <commit>{0,2} [--] [<path>...]
DESCRIPTION
-----------
@@ -26,7 +26,7 @@ tree and the index file, or the index file and the working tree.
'git-diff' [--options] --cached [<commit>] [--] [<path>...]::
This form is to view the changes you staged for the next
- commit relative to the named <tree-ish>. Typically you
+ commit relative to the named <commit>. Typically you
would want comparison with the latest commit, so if you
do not give <commit>, it defaults to HEAD.