diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-28 08:31:17 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-09-28 08:32:20 +1000 |
| commit | 30db8ad3c045a4fbcff171435bb8e56ed792a5ec (patch) | |
| tree | bd61c9dac5e063d097d9a1b97898f67995209201 /.gitignore | |
| parent | 779dd2f2af9a65f96b741c2692d7055bf5970969 (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>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -24,3 +24,4 @@ xclock.1 xclock-*.tar.* ChangeLog tags +INSTALL |