Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin

[J-u-boot.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 67fed082c8301959b82230904569675f06e8c422..7c56594381a62abb57f0dcd63c0ccccfc4f5e55e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,46 @@
+#
+# NOTE! Don't add files that are generated in specific
+# subdirectories here. Add them in the ".gitignore" file
+# in that subdirectory instead.
+#
+# Normal rules
+#
+
+*.rej
 *.orig
 *.a
 *.o
-*.depend
-System.map
+*~
+
+#
+# Top-level generic files
+#
+
+/System.map
 /u-boot
+/u-boot.hex
 /u-boot.map
 /u-boot.bin
 /u-boot.srec
+/u-boot.ldr
+/u-boot.ldr.hex
+/u-boot.ldr.srec
+
+#
+# Generated files
+#
+
+*.depend
 /LOG
 /errlog
 /reloc_off
 
+# stgit generated dirs
+patches-*
+
+# quilt's files
+patches
+series
+
+# cscope files
+cscope.*