From: Jonathan Nieder <jrnieder@gmail.com>
To: Yann Dirson <dirson@bertin.fr>
Cc: "Santi Béjar" <santi@agolina.net>, git@vger.kernel.org
Subject: [PATCH 4/4] Documentation: update "git diff --no-index" description
Date: Mon, 11 Oct 2010 11:06:18 -0500 [thread overview]
Message-ID: <20101011160618.GE25842@burratino> (raw)
In-Reply-To: <20101011160224.GA25842@burratino>
Originally "git diff --no-index" 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 changed to only trigger
when paths outside the tracked tree are mentioned.
Reported-by: Yann Dirson <dirson@bertin.fr>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Documentation/git-diff.txt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index fe34d4e..dd1fb32 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 [<commit>] [--] [<path>...]::
--
1.7.2.3
next prev parent reply other threads:[~2010-10-11 16:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-11 13:03 Undocumented git-diff syntax Yann Dirson
2010-10-11 13:59 ` Santi Béjar
2010-10-11 14:17 ` Yann Dirson
2010-10-11 14:52 ` Santi Béjar
2010-10-11 16:02 ` [PATCH 0/4] " Jonathan Nieder
2010-10-11 16:03 ` [PATCH 1/5] Documentation: gitrevisions is in section 7 Jonathan Nieder
2010-10-11 20:49 ` Sverre Rabbelier
2010-10-11 16:04 ` [PATCH 2/4] Documentation: diff can compare blobs Jonathan Nieder
2010-10-11 16:05 ` [PATCH 3/4] Documentation: expand 'git diff' SEE ALSO section Jonathan Nieder
2010-10-11 16:06 ` Jonathan Nieder [this message]
2010-10-11 16:07 ` [RFC/PATCH 5/4] Documentation: flesh out diff --no-index description Jonathan Nieder
2010-10-13 22:40 ` Junio C Hamano
2010-10-11 18:52 ` [PATCH 0/4] Re: Undocumented git-diff syntax Yann Dirson
2010-10-11 20:56 ` Sverre Rabbelier
2010-10-11 16:57 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101011160618.GE25842@burratino \
--to=jrnieder@gmail.com \
--cc=dirson@bertin.fr \
--cc=git@vger.kernel.org \
--cc=santi@agolina.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.