Code

Merge branch 'jc/diff-no-no-index'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2008 05:38:19 +0000 (22:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 May 2008 05:38:19 +0000 (22:38 -0700)
commit3beb56bde63d1a10abc02ffe76c1f98d59ec0874
tree69a2fa30848725866acfc359799bbfab5a2ce1d7
parent2fe18392f0355c80295b8b74b24fc817183d3752
parentb3fde6ccb1cbdd362dec19e317905f71528b3a53
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"
Makefile
builtin-diff-files.c
builtin-diff.c
diff.h
git.c