X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.gitignore;h=bbaf9de0bca797508b9c2a011d0d18eac8907157;hb=20f7a39825e30891056ab00ea620eaffda6aa451;hp=165b256e2e81ef36ca6b8f9dd8db8d0cc4f164d4;hpb=5a4d707a6d914fcea302e299fc18892d9e42c767;p=git.git

diff --git a/.gitignore b/.gitignore
index 165b256e2..bbaf9de0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+GIT-BUILD-OPTIONS
 GIT-CFLAGS
 GIT-GUI-VARS
 GIT-VERSION-FILE
@@ -50,6 +51,7 @@ git-gc
 git-get-tar-commit-id
 git-grep
 git-hash-object
+git-help
 git-http-fetch
 git-http-push
 git-imap-send
@@ -74,7 +76,6 @@ git-merge-one-file
 git-merge-ours
 git-merge-recursive
 git-merge-resolve
-git-merge-stupid
 git-merge-subtree
 git-mergetool
 git-mktag
@@ -141,7 +142,6 @@ git-write-tree
 git-core-*/?*
 gitk-wish
 gitweb/gitweb.cgi
-test-absolute-path
 test-chmtime
 test-date
 test-delta
@@ -149,6 +149,7 @@ test-dump-cache-tree
 test-genrandom
 test-match-trees
 test-parse-options
+test-path-utils
 test-sha1
 common-cmds.h
 *.tar.gz