Merge branch 'cc/no-gitk-build-dependency'

diff --git a/.gitignore b/.gitignore
index 956ae2260da04f76cfa1d055e4e6eabc359c1f68..8e8dc275db9bcc1155e42daea5a6589b4802bc9c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 /GIT-BUILD-OPTIONS
 /GIT-CFLAGS
 /GIT-LDFLAGS
-/GIT-GUI-VARS
 /GIT-PREFIX
+/GIT-PYTHON-VARS
 /GIT-SCRIPT-DEFINES
 /GIT-USER-AGENT
 /GIT-VERSION-FILE
@@ -171,7 +171,6 @@
 /git-whatchanged
 /git-write-tree
 /git-core-*/?*
-/gitk-git/gitk-wish
 /gitweb/GITWEB-BUILD-OPTIONS
 /gitweb/gitweb.cgi
 /gitweb/static/gitweb.js