X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=.gitignore;h=3edf6b41afe453130a3e7215991c6e2cd8dc57d7;hb=75187c9debdc57d47e0842f97e30cb912d364ff2;hp=b34a77a33a5f7f1e7a11cf8dda5d2f8b5e9186a1;hpb=622ef9df199cdbc11ff30e1d92324c1abe3f89cb;p=git.git

diff --git a/.gitignore b/.gitignore
index b34a77a3..3edf6b41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ git-check-ref-format
 git-checkout
 git-checkout-index
 git-cherry
+git-cherry-pick
 git-clone
 git-clone-pack
 git-commit
@@ -49,10 +50,13 @@ git-merge-base
 git-merge-index
 git-merge-octopus
 git-merge-one-file
+git-merge-ours
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
 git-mktag
+git-name-rev
+git-mv
 git-octopus
 git-pack-objects
 git-parse-remote
@@ -77,6 +81,7 @@ git-revert
 git-send-email
 git-send-pack
 git-sh-setup
+git-shell
 git-shortlog
 git-show-branch
 git-show-index
@@ -86,6 +91,7 @@ git-ssh-push
 git-ssh-upload
 git-status
 git-stripspace
+git-svnimport
 git-symbolic-ref
 git-tag
 git-tar-tree
@@ -106,3 +112,5 @@ git-core-*/?*
 *.deb
 git-core.spec
 *.exe
+libgit.a
+*.o