X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=.gitignore;h=3edf6b41afe453130a3e7215991c6e2cd8dc57d7;hb=a5ae8e64cfa09cea57cce832c8371818711d94c2;hp=52cb9e2c08ce3b77d9a39e461b410759bfe402f0;hpb=4ae22d96fe9248dac4f26b1fc91154ba5e879799;p=git.git

diff --git a/.gitignore b/.gitignore
index 52cb9e2c..3edf6b41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,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
@@ -78,6 +81,7 @@ git-revert
 git-send-email
 git-send-pack
 git-sh-setup
+git-shell
 git-shortlog
 git-show-branch
 git-show-index