Merge branch 'dp/maint-rebase-fix'

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 31ea9f13bad95866a8069566602573a4c2a5c258..bbaf9de0bca797508b9c2a011d0d18eac8907157 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,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
@@ -75,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