summaryrefslogtreecommitdiffstats
path: root/git-diff.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-12-16 07:44:04 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-12-16 07:44:04 +0000
commit7d23f5e7a7c3d63a342a4c00caeca4ab11d30d17 (patch)
tree944eec50c17521b2c193a081e6cc53276c56f5fa /git-diff.txt
parent47848ae0b2e2aa48f285bef6aa9fde0efa4295cd (diff)
downloadgit-htmldocs-7d23f5e7a7c3d63a342a4c00caeca4ab11d30d17.tar.gz
Autogenerated HTML docs for v1.4.4.2-g82dca
Diffstat (limited to 'git-diff.txt')
-rw-r--r--git-diff.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-diff.txt b/git-diff.txt
index 127d68c96..10fdf88dc 100644
--- a/git-diff.txt
+++ b/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 ] <tree-ish>{0,2} [--] [<path>...]
DESCRIPTION
-----------
@@ -30,7 +30,7 @@ tree and the index file, or the index file and the working tree.
would want comparison with the latest commit, so if you
do not give <commit>, it defaults to HEAD.
-'git-diff' [--options] <commit> -- [<path>...]::
+'git-diff' [--options] <commit> [--] [<path>...]::
This form is to view the changes you have in your
working tree relative to the named <commit>. You can
@@ -38,7 +38,7 @@ tree and the index file, or the index file and the working tree.
branch name to compare with the tip of a different
branch.
-'git-diff' [--options] <commit> <commit> -- [<path>...]::
+'git-diff' [--options] <commit> <commit> [--] [<path>...]::
This form is to view the changes between two <commit>,
for example, tips of two branches.