gitdiffcore(7): fix awkward wording

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 165b256e2e81ef36ca6b8f9dd8db8d0cc4f164d4..8054d9ddb8be3630f500be2ff37228aa17e839b1 100644 (file)
--- 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