Merge branch 'rj/test-regex' into maint-1.7.11

diff --git a/.gitignore b/.gitignore
index 1dbeb668dbdcf13ccdbb532e4314c901ae6f7d1c..f1acd3e777f5b8be846b3bdabf4743b84ad4fbca 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@
 /git-cherry-pick
 /git-clean
 /git-clone
+/git-column
 /git-commit
 /git-commit-tree
 /git-config
@@ -185,6 +186,7 @@
 /test-mktemp
 /test-parse-options
 /test-path-utils
+/test-regex
 /test-revision-walking
 /test-run-command
 /test-sha1