Merge branch 'fixes'

diff --git a/.gitignore b/.gitignore
index 9fde27fb4fcbad7ec0ab7563057dc0f001d383b9..d190c0ad072e61a550aa8d386ef42fc9c3625cb6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,13 +20,12 @@ git-cvsimport
 git-daemon
 git-diff
 git-diff-files
-git-diff-helper
 git-diff-index
 git-diff-stages
 git-diff-tree
-git-export
 git-fetch
 git-fetch-pack
+git-fmt-merge-msg
 git-format-patch
 git-fsck-objects
 git-get-tar-commit-id
@@ -70,22 +69,26 @@ git-reset
 git-resolve
 git-rev-list
 git-rev-parse
-git-rev-tree
 git-revert
+git-send-email
 git-send-pack
 git-sh-setup
 git-shortlog
 git-show-branch
 git-show-index
 git-ssh-fetch
+git-ssh-pull
+git-ssh-push
 git-ssh-upload
 git-status
 git-stripspace
+git-symbolic-ref
 git-tag
 git-tar-tree
 git-unpack-file
 git-unpack-objects
 git-update-index
+git-update-ref
 git-update-server-info
 git-upload-pack
 git-var
@@ -93,3 +96,9 @@ git-verify-pack
 git-verify-tag
 git-whatchanged
 git-write-tree
+git-core-*/?*
+*.tar.gz
+*.dsc
+*.deb
+git-core.spec
+*.exe