diff --git a/.gitignore b/.gitignore
index 7f2cd55088de2bdd109dbcd6b50b7dfd0c593115..91e69665f46bdecaedd4a9664e5238448b42467a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
GIT-VERSION-FILE
git
git-add
+git-add--interactive
git-am
git-annotate
git-apply
git-merge
git-merge-base
git-merge-index
+git-merge-file
git-merge-tree
git-merge-octopus
git-merge-one-file