Merge branch 'nd/columns'

diff --git a/.gitignore b/.gitignore
index 1dbeb668dbdcf13ccdbb532e4314c901ae6f7d1c..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