diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-23 18:15:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-24 00:07:38 -0700 |
| commit | 6304c29d518206b0780291a02f94f435abf82d74 (patch) | |
| tree | b16af93c1a809388a034a2522647fe923602f4da /Documentation | |
| parent | 3af828634fa5bdbca1b2061a81df8b3fa73b0d34 (diff) | |
| download | git-6304c29d518206b0780291a02f94f435abf82d74.tar.gz | |
diff-files: do not play --no-index games
Being able to say "git diff A B" outside a git repository and getting a
colourful version of "diff -u A B" may be nice, but such a cute hack
should not give bogus results to scripts that want to give two paths,
either or both of which happen to have been removed from the work tree,
to "git diff-files".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-diff-files.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 6d2ea16a25..ca1bb6a8ee 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -8,7 +8,7 @@ git-diff-files - Compares files in the working tree and the index SYNOPSIS -------- -'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [<common diff options>] [<path>...] +'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...] DESCRIPTION ----------- @@ -36,9 +36,6 @@ omit diff output for unmerged entries and just show "Unmerged". diff, similar to the way 'diff-tree' shows a merge commit with these flags. ---no-index:: - Compare the two given files / directories. - -q:: Remain silent even on nonexistent files |