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

diff --cc Documentation/technical/api-strbuf.txt
Simple merge

diff --cc Makefile
index 9f3a8ab0977bf23eb276e9cf5a6db96b206893e3,01242889eb888d35e28249a78d54584ebca4bb24..a82f173cb462f246a3efa5d26f1b53e18bcd4fe1
--- 1/Makefile
--- 2/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)
  

diff --cc builtin-apply.c
Simple merge