diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-03-05 12:51:26 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-03-05 12:51:26 +0100 |
| commit | 1ad6364eeb4f578e423081d1748e8a3fdf1ab01d (patch) | |
| tree | f55731737edf1cfd653b21f2ff9d387e6c53ae24 /.gitignore | |
| parent | 335143c76612a0ae26eef8abeda77641d4f63b50 (diff) | |
| parent | cc07294bc704694ae33db75b25ac557e5917a83f (diff) | |
| download | u-boot-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.tar.gz u-boot-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.tar.xz u-boot-1ad6364eeb4f578e423081d1748e8a3fdf1ab01d.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 50 |
1 files changed, 21 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore index d7d55383ac..ffe0cc7107 100644 --- a/.gitignore +++ b/.gitignore @@ -5,16 +5,20 @@ # # Normal rules # - -*.rej -*.orig -*.a +.* *.o +*.o.* +*.a +*.s *.su -*~ +*.mod.c +*.i +*.lst +*.order +*.elf *.swp -*.patch *.bin +*.patch *.cfgtmp *.dts.tmp @@ -24,36 +28,21 @@ # # Top-level generic files # - /MLO* /SPL /System.map -/u-boot -/u-boot.elf -/u-boot.hex -/u-boot.imx -/u-boot-with-spl.imx -/u-boot-with-nand-spl.imx -/u-boot.map -/u-boot.srec -/u-boot.ldr -/u-boot.ldr.hex -/u-boot.ldr.srec -/u-boot.img -/u-boot.kwb -/u-boot.sha1 -/u-boot.dis -/u-boot.lds -/u-boot.ubl -/u-boot.ais -/u-boot.dtb -/u-boot.sb +/u-boot* + +# +# git files that we don't want to ignore even it they are dot-files +# +!.gitignore +!.mailmap # # Generated files # -*.depend* /LOG /errlog /reloc_off @@ -65,7 +54,6 @@ /include/generated/ /include/spl-autoconf.mk /include/tpl-autoconf.mk -asm-offsets.s # stgit generated dirs patches-* @@ -91,3 +79,7 @@ GPATH GRTAGS GSYMS GTAGS + +*.orig +*~ +\#*# |