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 /t/t4013/diff.diff_--name-status_dir2_dir | |
| parent | Merge branch 'maint' (diff) | |
| parent | git diff --no-index: default to page like other diff frontends (diff) | |
| download | git-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.tar.gz git-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.zip | |
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 't/t4013/diff.diff_--name-status_dir2_dir')
| -rw-r--r-- | t/t4013/diff.diff_--name-status_dir2_dir | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t4013/diff.diff_--name-status_dir2_dir b/t/t4013/diff.diff_--name-status_dir2_dir index ef7fdb7335..d0d96aaa91 100644 --- a/t/t4013/diff.diff_--name-status_dir2_dir +++ b/t/t4013/diff.diff_--name-status_dir2_dir @@ -1,3 +1,2 @@ $ git diff --name-status dir2 dir -A dir/sub $ |