diff --git a/.gitignore b/.gitignore
index 0ffe14ac4eb85ff88b3b09c50584c6a6c2c4d794..4c8c8e411500fe2ed0108c46838d50576ed15185 100644 (file)
--- a/.gitignore
+++ b/.gitignore
git-merge-ours
git-merge-recur
git-merge-recursive
git-merge-ours
git-merge-recur
git-merge-recursive
+git-merge-recursive-old
git-merge-resolve
git-merge-stupid
git-mktag
git-merge-resolve
git-merge-stupid
git-mktag
git-update-server-info
git-upload-archive
git-upload-pack
git-update-server-info
git-upload-archive
git-upload-pack
-git-upload-tar
git-var
git-verify-pack
git-verify-tag
git-whatchanged
git-write-tree
git-var
git-verify-pack
git-verify-tag
git-whatchanged
git-write-tree
-git-zip-tree
git-core-*/?*
gitweb/gitweb.cgi
test-date
git-core-*/?*
gitweb/gitweb.cgi
test-date