summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-04 00:12:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-04 00:12:19 -0800
commitb63bc0bc3152ca42ba1c9fa9bed73da061beeca2 (patch)
tree709ceb2c6c62fa58f4d694599374ef10ac305cfe /Makefile
parentbash: offer to show (un)staged changes (diff)
parentMerge branch 'maint-1.6.0' into maint (diff)
downloadtgif-b63bc0bc3152ca42ba1c9fa9bed73da061beeca2.tar.xz
Merge branch 'maint'
* maint: User-manual: "git stash <comment>" form is long gone add test-dump-cache-tree in Makefile fix typo in Documentation apply: fix access to an uninitialized mode variable, found by valgrind Conflicts: Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 9f3a8ab097..a82f173cb4 100644
--- a/Makefile
+++ b/Makefile
@@ -1382,6 +1382,7 @@ TEST_PROGRAMS += test-chmtime$X
TEST_PROGRAMS += test-ctype$X
TEST_PROGRAMS += test-date$X
TEST_PROGRAMS += test-delta$X
+TEST_PROGRAMS += test-dump-cache-tree$X
TEST_PROGRAMS += test-genrandom$X
TEST_PROGRAMS += test-match-trees$X
TEST_PROGRAMS += test-parse-options$X