projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
48cbf91
c591d5f
)
Merge branch 'jk/gitignore-anchored'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 10 Nov 2009 20:31:11 +0000
(12:31 -0800)
committer
Junio 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
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
.gitignore
index f0d2e96b888d0a457dbd61ecb6c347c4dbb07f8a,289c3d0e26a3dff3317221e885752285e522875b..338c6d888123f326ce7b82a4c9c0459d618bef3d
---
1
/
.gitignore
---
2
/
.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