Merge branch 'jc/post-simplify' (early part) into tr/filter-branch

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 31ea9f13bad95866a8069566602573a4c2a5c258..a213e8e25bb2442326e86cbfb9ef56319f482869 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,6 @@ git-merge-one-file
 git-merge-ours
 git-merge-recursive
 git-merge-resolve
-git-merge-stupid
 git-merge-subtree
 git-mergetool
 git-mktag