From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Nov 2009 20:31:11 +0000 (-0800)
Subject: Merge branch 'jk/gitignore-anchored'
X-Git-Tag: v1.6.6-rc0~65
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=af526de90ca1ae1baf039f161cf9597d3ef379d4;p=git.git

Merge branch 'jk/gitignore-anchored'

* jk/gitignore-anchored:
  gitignore: root most patterns at the top-level directory

Conflicts:
	.gitignore
---

af526de90ca1ae1baf039f161cf9597d3ef379d4
diff --cc .gitignore
index f0d2e96b8,289c3d0e2..338c6d888
--- a/.gitignore
+++ b/.gitignore
@@@ -168,18 -168,17 +168,18 @@@
  *.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