Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index 83a5c9df1b2c21e21be9375ac01be94c8dcf941a..bf66648e2c5f59cb92470dbda546c5348bcc85ef 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-revision-walking
 /test-run-command
 /test-sha1
 /test-sigchain