Merge branch 'maint'

diff --git a/.gitignore b/.gitignore
index e8b060cbe43d13b82ad8686f7676a26ef559a609..20ee642420a82d71a5ed7df6194de87f436bc6de 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -96,6 +96,7 @@ git-push
 git-quiltimport
 git-read-tree
 git-rebase
+git-rebase--interactive
 git-receive-pack
 git-reflog
 git-relink
@@ -123,6 +124,7 @@ git-ssh-fetch
 git-ssh-pull
 git-ssh-push
 git-ssh-upload
+git-stash
 git-status
 git-stripspace
 git-submodule