From 9d83e3827fc1031bbcafb0d26128e95dda306aed Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 11 Oct 2010 11:03:32 -0500 Subject: Documentation: gitrevisions is in section 7 Fix references to gitrevisions(1) in the manual pages and HTML documentation. In practice, this will not matter much unless someone tries to use a hard copy of the git reference manual. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 08fd4099ad..481a33c7d1 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -68,11 +68,11 @@ for the last two forms that use ".." notations, can be any . For a more complete list of ways to spell , see -"SPECIFYING REVISIONS" section in linkgit:gitrevisions[1]. +"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. However, "diff" is about comparing two _endpoints_, not ranges, and the range notations (".." and "\...") do not mean a range as defined in the -"SPECIFYING RANGES" section in linkgit:gitrevisions[1]. +"SPECIFYING RANGES" section in linkgit:gitrevisions[7]. OPTIONS ------- -- cgit v1.2.1 From ed84e6d511f9e754d6331c63468bf7421b1e0894 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 11 Oct 2010 11:04:08 -0500 Subject: Documentation: diff can compare blobs Meanwhile, there is no plumbing command to compare two blobs. Strange. Reported-by: Yann Dirson Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 481a33c7d1..db2c6c2d31 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -64,8 +64,9 @@ forced by --no-index. Just in case if you are doing something exotic, it should be noted that all of the in the above description, except -for the last two forms that use ".." notations, can be any -. +in the last two forms that use ".." notations, can be any +. The third form ('git diff ') can also +be used to compare two objects. For a more complete list of ways to spell , see "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. -- cgit v1.2.1 From b77134b068f777c9b63ebfb8762c77968c49702f Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 11 Oct 2010 11:05:32 -0500 Subject: Documentation: expand 'git diff' SEE ALSO section Point in many directions in the hope of helping the reader find what is needed more quickly. This commit also removes the summary attached to the SEE ALSO entry for difftool, to avoid making the SEE ALSO list too verbose. If the reader wants a summary of the commands referred to, she can always look to the top of the named pages or to the table of contents on the main git(1) page. Suggested-by: Goswin von Brederlow Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index db2c6c2d31..fe34d4edb4 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -160,8 +160,12 @@ rewrites (very expensive). SEE ALSO -------- -linkgit:git-difftool[1]:: - Show changes using common diff tools +diff(1), +linkgit:git-difftool[1], +linkgit:git-log[1], +linkgit:gitdiffcore[7], +linkgit:git-format-patch[1], +linkgit:git-apply[1] Author ------ -- cgit v1.2.1 From 24757702395ed4c828af585f2d8ba0efda5cf697 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 11 Oct 2010 11:06:18 -0500 Subject: Documentation: update implicit "--no-index" behavior in "git diff" Originally "--no-index" mode triggered for untracked files within the tracked tree, but with v1.5.6-rc1~41 (Merge branch 'jc/diff-no-no-index, 2008-05-26) the command was fixed to only implicitly trigger when paths outside the tracked tree are mentioned. Reported-by: Yann Dirson Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Documentation/git-diff.txt') diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index fe34d4edb4..dd1fb32786 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -23,9 +23,9 @@ tree and the index file, or the index file and the working tree. further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]. + -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. +If exactly two paths are given and at least one points outside +the current repository, 'git diff' will compare the two files / +directories. This behavior can be forced by --no-index. 'git diff' [--options] --cached [] [--] [...]:: -- cgit v1.2.1