summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-20 17:50:51 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-20 17:50:51 -0400
commit66ccc37a99994f1206d308c0c0003ac2605d3c42 (patch)
tree17fd97ca91a7c963cf80ac1274c94ac841e8572c /.gitignore
parent66e2c6e3a16480e25f82ef447cfebac16997aac5 (diff)
git-recover-repository 1/2 done
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore11
1 files changed, 7 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 717b58abc..221087847 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
+tags
+Setup
+*.hi
+*.o
tmp
test
build-stamp
@@ -9,7 +13,10 @@ Build/OSXMkLibs
git-annex
git-annex.1
git-annex-shell.1
+git-union-merge
git-union-merge.1
+git-recover-repository
+git-recover-repository.1
doc/.ikiwiki
html
*.tix
@@ -22,7 +29,3 @@ cabal-dev
# OSX related
.DS_Store
.virthualenv
-tags
-Setup
-*.hi
-*.o