diff --git a/.gitignore b/.gitignore
index a43444fb92e3475eaadbc7792e0defb9153910fb..d99372afc48a96e73da49b1f0787861efaeac1ee 100644 (file)
--- a/.gitignore
+++ b/.gitignore
git-diff-stages
git-diff-tree
git-describe
+git-fast-import
git-fetch
git-fetch-pack
git-findtags
git-merge-octopus
git-merge-one-file
git-merge-ours
-git-merge-recur
git-merge-recursive
git-merge-resolve
git-merge-stupid