From d7747bd5bcba5eaeda690d7d5897462580f3c0e4 Mon Sep 17 00:00:00 2001 From: Kevin Bracey Date: Tue, 18 Jun 2013 17:58:50 +0300 Subject: Documentation: Move "git diff " The section describing "git diff " had been placed in a position that disrupted the statement "This is synonymous to the previous form". Reorder to place this form after all the -using forms, and the note applying to them. Also mention this form in the initial description paragraph. Signed-off-by: Kevin Bracey Signed-off-by: Junio C Hamano --- Documentation/git-diff.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index f8c06013f3..5effe97991 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -18,8 +18,8 @@ SYNOPSIS DESCRIPTION ----------- Show changes between the working tree and the index or a tree, changes -between the index and a tree, changes between two trees, or changes -between two files on disk. +between the index and a tree, changes between two trees, changes between +two blob objects, or changes between two files on disk. 'git diff' [--options] [--] [...]:: @@ -56,11 +56,6 @@ directories. This behavior can be forced by --no-index. This is to view the changes between two arbitrary . -'git diff' [options] :: - - This form is to view the differences between the raw - contents of two blob objects. - 'git diff' [--options] .. [--] [...]:: This is synonymous to the previous form. If on @@ -87,6 +82,11 @@ and the range notations (".." and "\...") do not mean a range as defined in the "SPECIFYING RANGES" section in linkgit:gitrevisions[7]. +'git diff' [options] :: + + This form is to view the differences between the raw + contents of two blob objects. + OPTIONS ------- :git-diff: 1 -- cgit v1.2.3