Merge branch 'jk/gitignore-anchored'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 20:31:11 +0000 (12:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 20:31:11 +0000 (12:31 -0800)
* jk/gitignore-anchored:
  gitignore: root most patterns at the top-level directory

Conflicts:
.gitignore

1  2 
.gitignore

diff --cc .gitignore
index f0d2e96b888d0a457dbd61ecb6c347c4dbb07f8a,289c3d0e26a3dff3317221e885752285e522875b..338c6d888123f326ce7b82a4c9c0459d618bef3d
  *.exe
  *.[aos]
  *.py[co]
- config.mak
- autom4te.cache
- config.cache
- config.log
- config.status
- config.mak.autogen
- config.mak.append
- configure
- tags
- TAGS
- cscope*
 +*+
+ /config.mak
+ /autom4te.cache
+ /config.cache
+ /config.log
+ /config.status
+ /config.mak.autogen
+ /config.mak.append
+ /configure
+ /tags
+ /TAGS
+ /cscope*
  *.obj
  *.lib
  *.sln