Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 8054d9ddb8be3630f500be2ff37228aa17e839b1..bbaf9de0bca797508b9c2a011d0d18eac8907157 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ git-gc
 git-get-tar-commit-id
 git-grep
 git-hash-object
+git-help
 git-http-fetch
 git-http-push
 git-imap-send
@@ -141,7 +142,6 @@ git-write-tree
 git-core-*/?*
 gitk-wish
 gitweb/gitweb.cgi
-test-absolute-path
 test-chmtime
 test-date
 test-delta
@@ -149,6 +149,7 @@ test-dump-cache-tree
 test-genrandom
 test-match-trees
 test-parse-options
+test-path-utils
 test-sha1
 common-cmds.h
 *.tar.gz