merge G5

[home.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 649e22172edcf655901bf6a52f1242ac871483b1..e8c0ad6d8028bb8b4281f72b16f7042c99ed419f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,40 +2,44 @@
 *~
 
 # generated files
+*.gdb
 *.o
 a.out
+/log
+/out
 
 # Session files
 /.bugz_cookie
 /.dbus/session-bus/
 /.DCOPserver_*
+/.dmrc
+/.gnomerc-errors
 /.ICEauthority
+/.ktorrent.lock
 /.pulse-cookie
+/.serverauth.*
+/.sudo_as_admin_successful
 /.Xauthority
 /.xsession-errors*
 
-/.ash_history
-/.bash_history
+/.*_history
 /.cgdb/readline_history.txt
 /.clive/recall
+/.fbhighlevelshistory
 /.gconfd/saved_state
 .gdb_history
 /.gitk
-/.gnuplot_history
 /.history
 /.jtag/history
 /.lesshst
 /.links/links.his
-/.linphonec_history
-/.mysql_history
-/.nano_history
-/.php_history
+/.octave_hist
 /.recently-used*
-/.sh_history
 /.tgdb/a2_tgdb_debug.txt
 /.tgdb/tgdb_log.txt
 /.viminfo
 /.wireshark/recent
+/minicom.cap
 /minicom.log
 
 /test
@@ -61,6 +65,8 @@ a.out
 /.xchat2/scrollback/
 
 # Packages i don't care about
+/.clive/
+/.crash_report_*
 /.audacious/
 /.crack-attack/
 /.ddd/
@@ -93,7 +99,8 @@ a.out
 /.ncftp/firewall
 /.ncftp/history
 /.ncftp/init_v3
-/.ncftp/trace
+/.ncftp/log
+/.ncftp/trace*
 
 /.pan2/accels.txt
 /.pan2/article-cache
@@ -109,3 +116,7 @@ a.out
 
 # per-system files
 /Desktop/
+
+# other git trees
+/ICEs/
+/patches/