summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-08 16:18:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-08 16:18:16 -0400
commit844abdb460f89d1ffca71715ce58e5b2ccc0fc15 (patch)
tree62220146aa67d6a107c50261894eb4b33b33f8a6
parent3c0f8f3bd1ba3147e3d87a2c95241901f4400c28 (diff)
parent086b62d5fb96c32d6b5cf2516bb450fea14d92da (diff)
Merge branch 'gitignore-cabal-sandbox' of https://github.com/frasertweedale/git-annex
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b842cc93c..624675d27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,9 @@ html
dist
# Sandboxed builds
cabal-dev
+.cabal-sandbox
+cabal.sandbox.config
+cabal.config
# Project-local emacs configuration
.dir-locals.el
# OSX related