]> source.dussan.org Git - gitignore.git/commitdiff
projects / gitignore.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e518427 83a92c8)
Merge remote branch 'upstream/master'
authorDaniel Schildt <daniel.schildt@gmail.com>
Fri, 12 Nov 2010 21:59:36 +0000 (23:59 +0200)
committerDaniel Schildt <daniel.schildt@gmail.com>
Fri, 12 Nov 2010 21:59:36 +0000 (23:59 +0200)
* upstream/master:
  added rerun and config ignores
  Add Haskell gitignore
  Added ExpressionEngine gitignore file.
  Fixed comment in Objective-C.gitignore
  Fixed comments in C++.gitignore
  Fixed comments in Archives.gitignore
  Fixed comment in Linux.gitignore file
  Small cleanup of comments in the file


Trivial merge
A collection of useful .gitignore templates: https://github.com/github/gitignore