From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Feb 2009 08:12:19 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.2-rc0~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b63bc0bc3152ca42ba1c9fa9bed73da061beeca2;p=git.git

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
---

b63bc0bc3152ca42ba1c9fa9bed73da061beeca2
diff --cc Makefile
index 9f3a8ab09,01242889e..a82f173cb
--- a/Makefile
+++ b/Makefile
@@@ -1378,16 -1353,7 +1378,17 @@@ endi
  
  ### Testing rules
  
 -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
 +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
 +TEST_PROGRAMS += test-path-utils$X
 +TEST_PROGRAMS += test-sha1$X
 +TEST_PROGRAMS += test-sigchain$X
  
  all:: $(TEST_PROGRAMS)