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 /git.c | |
| parent | 2fe18392f0355c80295b8b74b24fc817183d3752 (diff) | |
| parent | b3fde6ccb1cbdd362dec19e317905f71528b3a53 (diff) | |
| download | git-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.tar.gz | |
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 'git.c')
| -rw-r--r-- | git.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -294,7 +294,7 @@ static void handle_internal_command(int argc, const char **argv) { "count-objects", cmd_count_objects, RUN_SETUP }, { "describe", cmd_describe, RUN_SETUP }, { "diff", cmd_diff }, - { "diff-files", cmd_diff_files }, + { "diff-files", cmd_diff_files, RUN_SETUP }, { "diff-index", cmd_diff_index, RUN_SETUP }, { "diff-tree", cmd_diff_tree, RUN_SETUP }, { "fast-export", cmd_fast_export, RUN_SETUP }, |