summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-06-16 01:22:10 -0700
committerJunio C Hamano <gitster@pobox.com>2007-06-16 01:22:10 -0700
commit5bd148bfe8a4f2df8487e029cd4ee6809bc4c963 (patch)
tree1960d9d9011cb728631b357c928745b42d096eda /.gitignore
parentc5f71ad09994b46d80878ce72d1ca6f59935d952 (diff)
parentc7c84859ad586ae5670224e1abc4f846f7c3a9ae (diff)
downloadgit-5bd148bfe8a4f2df8487e029cd4ee6809bc4c963.tar.gz
Merge branch 'maint' to sync with GIT 1.5.2.2
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index bd49cd4627..e8b060cbe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -157,7 +157,7 @@ common-cmds.h
*.tar.gz
*.dsc
*.deb
-git-core.spec
+git.spec
*.exe
*.[aos]
*.py[co]