Merge branch 'rh/ishes-doc'

diff --git a/.gitignore b/.gitignore
index 1640c3ad005adbeecf4b90f92e5d3369c6490697..66199edd4af6ddcd1398bff13fe9065ba4309a22 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@
 /git-cat-file
 /git-check-attr
 /git-check-ignore
+/git-check-mailmap
 /git-check-ref-format
 /git-checkout
 /git-checkout-index
@@ -191,6 +192,8 @@
 /test-mktemp
 /test-parse-options
 /test-path-utils
+/test-prio-queue
+/test-read-cache
 /test-regex
 /test-revision-walking
 /test-run-command
@@ -199,6 +202,7 @@
 /test-string-list
 /test-subprocess
 /test-svn-fe
+/test-urlmatch-normalization
 /test-wildmatch
 /common-cmds.h
 *.tar.gz