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

[u-boot] / .gitignore

diff --git a/.gitignore b/.gitignore
index cda275ec73b289c3c230ff9195ecaae4c800b71a..89e96f566d9a4e192e412a9102548a091eb50301 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@
 *.orig
 *.a
 *.o
+*~
+*.patch
 
 #
 # Top-level generic files
@@ -17,9 +19,13 @@
 
 /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
@@ -32,6 +38,7 @@
 
 # stgit generated dirs
 patches-*
+.stgit-edit.txt
 
 # quilt's files
 patches