diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-26 22:38:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-26 22:38:19 -0700 |
| commit | 3beb56bde63d1a10abc02ffe76c1f98d59ec0874 (patch) | |
| tree | 69a2fa30848725866acfc359799bbfab5a2ce1d7 /Documentation | |
| parent | Merge branch 'maint' (diff) | |
| parent | git diff --no-index: default to page like other diff frontends (diff) | |
| download | tgif-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.tar.xz | |
Merge branch 'jc/diff-no-no-index'
* jc/diff-no-no-index:
git diff --no-index: default to page like other diff frontends
git-diff: allow --no-index semantics a bit more
"git diff": do not ignore index without --no-index
diff-files: do not play --no-index games
tests: do not use implicit "git diff --no-index"
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 |