Merge branch 'master' into lj/refs
[git/git.git] / .gitignore
index 0ffe14a..4c8c8e4 100644 (file)
@@ -66,6 +66,7 @@ git-merge-one-file
 git-merge-ours
 git-merge-recur
 git-merge-recursive
 git-merge-ours
 git-merge-recur
 git-merge-recursive
+git-merge-recursive-old
 git-merge-resolve
 git-merge-stupid
 git-mktag
 git-merge-resolve
 git-merge-stupid
 git-mktag
@@ -125,13 +126,11 @@ git-update-ref
 git-update-server-info
 git-upload-archive
 git-upload-pack
 git-update-server-info
 git-upload-archive
 git-upload-pack
-git-upload-tar
 git-var
 git-verify-pack
 git-verify-tag
 git-whatchanged
 git-write-tree
 git-var
 git-verify-pack
 git-verify-tag
 git-whatchanged
 git-write-tree
-git-zip-tree
 git-core-*/?*
 gitweb/gitweb.cgi
 test-date
 git-core-*/?*
 gitweb/gitweb.cgi
 test-date