X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.gitignore;h=8054d9ddb8be3630f500be2ff37228aa17e839b1;hb=877276d4d3018d2810be990c39fa7f59678e960d;hp=165b256e2e81ef36ca6b8f9dd8db8d0cc4f164d4;hpb=6d21667206c4c2b10aad99eca1530a4f17c4e61d;p=git.git

diff --git a/.gitignore b/.gitignore
index 165b256e2..8054d9ddb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+GIT-BUILD-OPTIONS
 GIT-CFLAGS
 GIT-GUI-VARS
 GIT-VERSION-FILE
@@ -74,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