summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-28 08:31:17 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-28 08:32:20 +1000
commit30db8ad3c045a4fbcff171435bb8e56ed792a5ec (patch)
treebd61c9dac5e063d097d9a1b97898f67995209201
parent779dd2f2af9a65f96b741c2692d7055bf5970969 (diff)
Add INSTALL to .gitignore. (#24157)
Avoids git error "fatal: Untracked working tree file 'INSTALL' would be overwritten by merge." when switching between pre-1.0.4 and now. X.Org Bug 24157 <http://bugs.freedesktop.org/show_bug.cgi?id=24157> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8560e15..4e2450a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ xclock.1
xclock-*.tar.*
ChangeLog
tags
+INSTALL