blame.c: move code to output metainfo into a separate function.

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3ca66e42fdbc0b4df11d38867e6d1faa7c9d5172..25eb4637a6f971a4a290ab823a937997c700bd7f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,7 @@ 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
@@ -122,7 +123,6 @@ git-update-ref
 git-update-server-info
 git-upload-archive
 git-upload-pack
-git-upload-tar
 git-var
 git-verify-pack
 git-verify-tag