aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-03 23:50:09 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-03 23:50:09 -0800
commitf0817310903312bbc243dd80f066e17a8e0e4b1d (patch)
treefd619c9bf1e11ee6ea1ad5d6a000f96146f916b6 /Makefile
parent281907574ca420cc9a800190509adbf89bf9a2d1 (diff)
parent7a85f6ae88be5937c32a7b61601a40a02c03fb3f (diff)
downloadgit-f0817310903312bbc243dd80f066e17a8e0e4b1d.tar.gz
git-f0817310903312bbc243dd80f066e17a8e0e4b1d.tar.xz
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: 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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index aabf0130b..01242889e 100644
--- a/Makefile
+++ b/Makefile
@@ -1353,7 +1353,7 @@ endif
### Testing rules
-TEST_PROGRAMS = test-chmtime$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-parse-options$X test-path-utils$X
+TEST_PROGRAMS = test-chmtime$X test-dump-cache-tree$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-parse-options$X test-path-utils$X
all:: $(TEST_PROGRAMS)