aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-26 22:38:19 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-26 22:38:19 -0700
commit3beb56bde63d1a10abc02ffe76c1f98d59ec0874 (patch)
tree69a2fa30848725866acfc359799bbfab5a2ce1d7 /Makefile
parent2fe18392f0355c80295b8b74b24fc817183d3752 (diff)
parentb3fde6ccb1cbdd362dec19e317905f71528b3a53 (diff)
downloadgit-3beb56bde63d1a10abc02ffe76c1f98d59ec0874.tar.gz
git-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 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 4e36487c3..cce5a6e1b 100644
--- a/Makefile
+++ b/Makefile
@@ -405,6 +405,7 @@ LIB_OBJS += diffcore-order.o
LIB_OBJS += diffcore-pickaxe.o
LIB_OBJS += diffcore-rename.o
LIB_OBJS += diff-delta.o
+LIB_OBJS += diff-no-index.o
LIB_OBJS += diff-lib.o
LIB_OBJS += diff.o
LIB_OBJS += dir.o