summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-06 22:11:30 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-06 22:11:30 -0800
commit1fd365d5efab58453d9200d51ddf6ec700e03d8b (patch)
tree5d50b5aefc76b34866292368b3556363e3584d05 /.gitignore
parent4f43e9726af5d036af96de9e5208a6122d378f9b (diff)
parent1a59d881dee5c3cd691c522b27b6f6a88fa31326 (diff)
downloadgit-1fd365d5efab58453d9200d51ddf6ec700e03d8b.tar.gz
Merge branch 'cc/no-gitk-build-dependency'
Remove leftover bits from an earlier change to move gitk in its own subdirectory. Reimplementing the dependency tracking rules needs to be done in gitk history separately. * cc/no-gitk-build-dependency: Makefile: replace "echo 1>..." with "echo >..." Makefile: detect when PYTHON_PATH changes Makefile: remove tracking of TCLTK_PATH
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 956ae2260d..8e8dc275db 100644
--- 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