Merge branch 'jc/clone'

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b670877510ca89bad91bed82e7527d26f2fa9248..d706dd92c6a63474616c09388fc9744ff055cedc 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -60,13 +60,13 @@ git-mailsplit
 git-merge
 git-merge-base
 git-merge-index
+git-merge-file
 git-merge-tree
 git-merge-octopus
 git-merge-one-file
 git-merge-ours
 git-merge-recur
 git-merge-recursive
-git-merge-recursive-old
 git-merge-resolve
 git-merge-stupid
 git-mktag
@@ -75,6 +75,7 @@ git-name-rev
 git-mv
 git-pack-redundant
 git-pack-objects
+git-pack-refs
 git-parse-remote
 git-patch-id
 git-peek-remote
@@ -106,6 +107,7 @@ git-shortlog
 git-show
 git-show-branch
 git-show-index
+git-show-ref
 git-ssh-fetch
 git-ssh-pull
 git-ssh-push