X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff.txt;h=c53eba557d0a242a0d8553d9569ce8b2eb86331b;hb=996869601594ffefb67238175055922340ced6f8;hp=57c28628bbfb86b7fa190f7530583fc6ac665d9e;hpb=105c21df14531bf2fd39e05b4c3a9aa31349da06;p=git.git diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 57c28628b..c53eba557 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -8,14 +8,14 @@ git-diff - Show changes between commits, commit and working tree, etc SYNOPSIS -------- -'git-diff' [] {0,2} [--] [...] +'git diff' [] {0,2} [--] [...] DESCRIPTION ----------- 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. -'git-diff' [--options] [--] [...]:: +'git diff' [--options] [--] [...]:: This form is to view the changes you made relative to the index (staging area for the next commit). In other @@ -27,14 +27,14 @@ If exactly two paths are given, and at least one is untracked, compare the two files / directories. This behavior can be forced by --no-index. -'git-diff' [--options] --cached [] [--] [...]:: +'git diff' [--options] --cached [] [--] [...]:: This form is to view the changes you staged for the next commit relative to the named . Typically you would want comparison with the latest commit, so if you do not give , it defaults to HEAD. -'git-diff' [--options] [--] [...]:: +'git diff' [--options] [--] [...]:: This form is to view the changes you have in your working tree relative to the named . You can @@ -42,23 +42,23 @@ forced by --no-index. branch name to compare with the tip of a different branch. -'git-diff' [--options] [--] [...]:: +'git diff' [--options] [--] [...]:: This is to view the changes between two arbitrary . -'git-diff' [--options] .. [--] [...]:: +'git diff' [--options] .. [--] [...]:: This is synonymous to the previous form. If on one side is omitted, it will have the same effect as using HEAD instead. -'git-diff' [--options] \... [--] [...]:: +'git diff' [--options] \... [--] [...]:: This form is to view the changes on the branch containing and up to the second , starting at a common ancestor - of both . "git-diff A\...B" is equivalent to - "git-diff $(git-merge-base A B) B". You can omit any one + of both . "git diff A\...B" is equivalent to + "git diff $(git-merge-base A B) B". You can omit any one of , which has the same effect as using HEAD instead. Just in case if you are doing something exotic, it should be @@ -168,4 +168,4 @@ Documentation by Junio C Hamano and the git-list . GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite