projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
[ghc-hetmet.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
79629da
..
3e2e7f4
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-7,6
+7,7
@@
*.BAK
*.orig
*.prof
*.BAK
*.orig
*.prof
+*.rej
*.hi
*.hi-boot
*.hi
*.hi-boot
@@
-22,6
+23,7
@@
*.o.cmd
*.depend*
log
*.o.cmd
*.depend*
log
+tags
autom4te.cache
config.log
autom4te.cache
config.log
@@
-29,6
+31,12
@@
config.status
configure
# -----------------------------------------------------------------------------
configure
# -----------------------------------------------------------------------------
+# Ignore any overlapped darcs repos and back up files
+
+*-darcs-backup*
+_darcs/
+
+# -----------------------------------------------------------------------------
# sub-repositories
/ghc-tarballs/
# sub-repositories
/ghc-tarballs/
@@
-78,9
+86,7
@@
configure
/bindist-list
/bindistprep/
/bindisttest/HelloWorld
/bindist-list
/bindistprep/
/bindisttest/HelloWorld
-/bindisttest/a/
-/bindisttest/install\ dir/
-/bindisttest/output
+/bindisttest/
/ch01.html
/ch02.html
/compiler/cmm/CmmLex.hs
/ch01.html
/ch02.html
/compiler/cmm/CmmLex.hs
@@
-118,8
+124,12
@@
configure
/docs/users_guide/users_guide.xml
/docs/users_guide/users_guide/
/docs/users_guide/what_glasgow_exts_does.gen.xml
/docs/users_guide/users_guide.xml
/docs/users_guide/users_guide/
/docs/users_guide/what_glasgow_exts_does.gen.xml
+/driver/ghc/dist/
+/driver/haddock/dist/
/driver/ghci/ghc-pkg-inplace
/driver/ghci/ghci-inplace
/driver/ghci/ghc-pkg-inplace
/driver/ghci/ghci-inplace
+/driver/ghci/dist/
+/driver/ghci/ghci.res
/driver/mangler/dist/ghc-asm
/driver/mangler/dist/ghc-asm.prl
/driver/package.conf
/driver/mangler/dist/ghc-asm
/driver/mangler/dist/ghc-asm.prl
/driver/package.conf
@@
-127,7
+137,7
@@
configure
/driver/split/dist/ghc-split
/driver/split/dist/ghc-split.prl
/driver/stamp-pkg-conf-rts
/driver/split/dist/ghc-split
/driver/split/dist/ghc-split.prl
/driver/stamp-pkg-conf-rts
-/extra-gcc-opts
+/settings
/ghc.spec
/ghc/ghc-bin.cabal
/ghc/stage1/
/ghc.spec
/ghc/ghc-bin.cabal
/ghc/stage1/
@@
-149,6
+159,8
@@
configure
/libffi/package.conf.inplace
/libffi/package.conf.inplace.raw
/libffi/stamp*
/libffi/package.conf.inplace
/libffi/package.conf.inplace.raw
/libffi/stamp*
+/libffi/package.conf.install
+/libffi/package.conf.install.raw
/libraries/bin-package-db/GNUmakefile
/libraries/bin-package-db/ghc.mk
/libraries/bootstrapping.conf
/libraries/bin-package-db/GNUmakefile
/libraries/bin-package-db/ghc.mk
/libraries/bootstrapping.conf
@@
-184,6
+196,8
@@
configure
/rts/package.conf.inplace.raw
/rts/sm/Evac_thr.c
/rts/sm/Scav_thr.c
/rts/package.conf.inplace.raw
/rts/sm/Evac_thr.c
/rts/sm/Scav_thr.c
+/rts/package.conf.install
+/rts/package.conf.install.raw
/stage3.package.conf
/testsuite_summary.txt
/testlog
/stage3.package.conf
/testsuite_summary.txt
/testlog
@@
-217,3
+231,4
@@
configure
/utils/runghc/runhaskell
/utils/runstdtest/runstdtest
/utils/unlit/unlit
/utils/runghc/runhaskell
/utils/runstdtest/runstdtest
/utils/unlit/unlit
+