Diffusion gitignore (master) History

History
mastere105d8c4b26e9031691ee3d…

Nov 11 2013

Merge pull request #838 from tiredpixel/ruby-slashes
e105d8c4b26e
·Carl Suster on Nov 11 2013, 22:48.
Unslashify *.gem,*.rbc,.rvmrc .
ca456f73e42b
·tiredpixel on Nov 11 2013, 22:41.
Slashify Ruby files and directories.
3b7ac85ad84a
·tiredpixel on Nov 11 2013, 20:50.
Merge pull request #443 from bungeshea/BricxCC
a1e656a09306
·Adam Roben on Nov 11 2013, 20:31.
Add comment to BricxCC.gitignore
9345b6b46138
·Shea Bunge on Nov 11 2013, 20:28.
Move BricxCC.gitignore to Global directory
8cbac43dabf9
·Shea Bunge on Nov 11 2013, 20:27.
Merge pull request #837 from milas/master
c928e22aab3a
·Adam Roben on Nov 11 2013, 19:28.
Add Azure publish XML file
74b6dd15662b
·Milas Bowman on Nov 11 2013, 18:52.
Merge pull request #506
52628ac48968
·Justin Spahr-Summers on Nov 11 2013, 18:51.
Merge remote-tracking branch 'origin/master' into pr/506
1a1de190aed7
·Justin Spahr-Summers on Nov 11 2013, 18:51.
Merge pull request #615 from kristens/master
8335a5dad97d
·Adam Roben on Nov 11 2013, 18:26.
Merge pull request #582 from xnt/patch-1
0eb7703d1183
·Adam Roben on Nov 11 2013, 18:24.
Merge pull request #836 from jephir/fix-unity
81c11d90a399
·Adam Roben on Nov 11 2013, 18:11.
Prevent Unity .gitignore from ignoring non-Unity project files
4469ba493892
·Jephir on Nov 11 2013, 18:09.
Merge pull request #834 from arcresu/ruby-version
768534c42f42
·Adam Roben on Nov 11 2013, 17:07.
Merge pull request #488 from nanadevelopment/eeConfigAdd
e85ec2d82850
·Adam Roben on Nov 11 2013, 14:37.
Merge pull request #477 from neilkelty/master
7bf906575042
·Adam Roben on Nov 11 2013, 14:26.
Merge pull request #831 from arcresu/idea
2fea1b6b925f
·Adam Roben on Nov 11 2013, 14:25.
Merge pull request #424 from MichaelMBishop/master
9463c86d9b3f
·Adam Roben on Nov 11 2013, 14:15.
Merge pull request #421 from matheussl/master
b5ff70798713
·Justin Spahr-Summers on Nov 11 2013, 08:12.

Nov 10 2013

Join comments in rails template
669668fb14be
·Carl Suster on Nov 10 2013, 11:39.
Tighten some ruby ignore patterns
efd3490a54ae
·Carl Suster on Nov 10 2013, 11:13.
Optionally ignore ruby env normalisation files, with comments
0ac2f7cb820b
·Carl Suster on Nov 10 2013, 11:12.
Merge pull request #833 from benmoss/master
d72190c56ad3
·Carl Suster on Nov 10 2013, 01:30.

Nov 9 2013

Leiningen by default creates a 'target' directory, not 'targets'
f4e8e686d6a0
·Ben Moss on Nov 9 2013, 17:32.
Merge pull request #743 from hkdobrev/master
e0baa57b5850
·Carl Suster on Nov 9 2013, 13:01.
Add Composer.gitignore for composer packages
3932f1f0ce7a
·Haralan Dobrev on Nov 9 2013, 12:38.
Remove IntelliJ rules from Android -> Global/JetBrains
4f659df36e63
·Carl Suster on Nov 9 2013, 03:02.
Merge pull request #832 from arcresu/latex
35c6da6ea180
·Adam Roben on Nov 9 2013, 00:06.

Nov 8 2013

Rename LaTeX->TeX
81f8222e7fb5
·Carl Suster on Nov 8 2013, 23:34.
Ignore .pyg files from LaTeX's minted package
ce47378cc699
·Manuel Rauber / Carl Suster on Nov 8 2013, 23:19.
Sort LaTeX auxiliary files by package
70fd1fd45cd6
·Carl Suster on Nov 8 2013, 23:19.
Merge pull request #828 from vvolkgang/patch-1
40e48553fdf2
·Carl Suster on Nov 8 2013, 22:34.
Rename template IDEA->JetBrains
9ae01d0b642e
·Carl Suster on Nov 8 2013, 22:14.
Add back out/ for IntelliJ under IDEA
af886f72c894
·Carl Suster on Nov 8 2013, 22:04.
Remove .idea/ from ObjectiveC in favour of Global/IDEA
1ef80036f0f7
·Carl Suster on Nov 8 2013, 21:37.
Add .idea/tasks.xmk to IDEA ignore suggections
af9ec6115c8d
·Carl Suster on Nov 8 2013, 21:36.
Remove individual JetBrains IDE templates in favour of IDEA template
fcf0a9ccab20
·Carl Suster on Nov 8 2013, 21:28.
Add an IDEA template to cover all related IDEs
aa00e7f210e4
·Carl Suster on Nov 8 2013, 21:28.
Merge pull request #829 from arcresu/patch-1
03de45fa7577
·Adam Roben on Nov 8 2013, 21:19.
Merge pull request #452 from BFTrick/patch-1
4d108dc73db3
·Carl Suster on Nov 8 2013, 21:11.
merging upstream changes
1f4bf1f36d8e
·Patrick Rauland on Nov 8 2013, 20:54.
Make sublime-project rule off by default
3dadf4e9b3fe
·Carl Suster on Nov 8 2013, 20:37.
Add comment to prevent *.sublime-project being ignored.
024d6e83fcd0
·Carl Suster on Nov 8 2013, 20:37.
Merge pull request #830 from kerimdzhanov/fix/node-gitignore
c67cfaf01ceb
·Adam Roben on Nov 8 2013, 15:32.
remove `npm-debug.log` entry
fa1ea3d7f2fc
·Dan Kerimdzhanov on Nov 8 2013, 13:34.
Merge pull request #802 from lukemetz/master
f8ac87bd8f39
·Carl Suster on Nov 8 2013, 06:28.
Merge pull request #705 from caiquerodrigues/patch-1
66f5b6f34356
·Adam Roben on Nov 8 2013, 04:55.
Merge pull request #814 from xiaogaozi/patch-1
523c52fe52d3
·Adam Roben on Nov 8 2013, 04:50.
Merge pull request #805 from Utumno/patch-1
684a4fe44bd2
·Adam Roben on Nov 8 2013, 04:44.
Merge pull request #623 from seabre/patch-1
4e85d13e9614
·Carl Suster on Nov 8 2013, 03:54.
Merge with latest master from upstream. Fix merge conflict with Leiningen.
e4cc7a56ba06
·Sean Brewer on Nov 8 2013, 03:50.
Merge pull request #509 from cjerdonek/master
bd8dab38455b
·Carl Suster on Nov 8 2013, 03:31.
Make Python .gitignore directory entries match only directories.
c038e773de33
·Chris Jerdonek on Nov 8 2013, 03:13.
Added Visual Studio .suo files
6b7079509839
·Álison Fernandes on Nov 8 2013, 02:59.
Ignore elf and hex in C.gitignore
502cb31439a7
·= on Nov 8 2013, 01:12.

Nov 7 2013

Merge pull request #636 from msgerbush/patch-1
b65855ee93eb
·Adam Roben on Nov 7 2013, 20:42.
Merge branch 'master' into patch-1
95075cccba0e
·Michael Gerbush on Nov 7 2013, 20:04.
Merge pull request #501 from karenetheridge/master
7bbc288b5277
·Adam Roben on Nov 7 2013, 19:39.
Merge pull request #505 from abrodkin/qt-additions
f94c2a0b7937
·Adam Roben on Nov 7 2013, 19:38.
Merge pull request #522 from zellux/master
6309a0abeae7
·Adam Roben on Nov 7 2013, 19:34.
Merge pull request #379 from azzlack/master
d9b3471c1fb7
·Adam Roben on Nov 7 2013, 14:56.
Merge pull request #503 from SimonSimCity/master
f4b8c4817b3c
·Adam Roben on Nov 7 2013, 14:46.
Merge pull request #346 from bripkens/patch-1
834dc0a18300
·Adam Roben on Nov 7 2013, 14:35.
Merge pull request #352 from ghost/master
9338b030e7a8
·Adam Roben on Nov 7 2013, 14:35.
Merge pull request #350 from r1pp3rj4ck/patch-1
320a2c4ef444
·Adam Roben on Nov 7 2013, 14:30.
Merge pull request #343 from jcowgill/master
eb49a83cbaa4
·Adam Roben on Nov 7 2013, 14:14.
Merge pull request #634 from nikr/patch-1
f5a760d2566d
·Carl Suster on Nov 7 2013, 11:06.
add .brf for files generated by hyperref
f0036b5a401a
·Niklas Rehfeld / Nik on Nov 7 2013, 10:54.
Merge pull request #453 from oschrenk/patch-1
48c388942c8e
·Carl Suster on Nov 7 2013, 04:58.
Merge pull request #618 from rayshan/patch-1
1db3f61e98c2
·Carl Suster on Nov 7 2013, 04:46.
Merge pull request #767 from lunks/remove-dot-project-from-rails-gitignore
b0e2d94e53c2
·Carl Suster on Nov 7 2013, 04:28.
Merge pull request #643 from stationkeeping/patch-1
db625a1012e9
·Carl Suster on Nov 7 2013, 00:30.

Nov 6 2013

Merge pull request #821 from healsdata/master
49d7fbfc8cd4
·Adam Roben on Nov 6 2013, 15:03.
Allow the Vagrantfile to be tracked as that's the intended purpose.
c1af2ae82918
·Jonathan Campbell on Nov 6 2013, 04:41.
Merge pull request #398 from huxuan/master
8e101905d6b4
·Carl Suster on Nov 6 2013, 04:25.
Merge pull request #438 from ChristianBoehlke/master
de4f9eff4f2d
·Carl Suster on Nov 6 2013, 04:11.

Nov 5 2013

Merge pull request #315 from torbjoernk/global_add_kdevelop
7e4feaf658d1
·Justin Spahr-Summers on Nov 5 2013, 20:23.
Merge pull request #826 from cobyism/rework-contributing-guides
6188909b96c8
·Coby Chapple on Nov 5 2013, 18:06.
extract out new contributing guidelines to CONTRIBUTING.md
7375f82fac98
·Coby Chapple on Nov 5 2013, 18:05.
Merge pull request #302 from bakkdoor/master
798d9f15c247
·Adam Roben on Nov 5 2013, 18:04.
Merge pull request #300 from pangratz/add_texlipse
1099dea39f81
·Adam Roben on Nov 5 2013, 18:03.
Merge pull request #232 from tomparle/patch-1
47ebff05b6f1
·Adam Roben on Nov 5 2013, 17:49.
Merge pull request #820 from harshadsabne/master
7ff92c890a2f
·Adam Roben on Nov 5 2013, 17:39.
Merge pull request #825 from tamird/patch-1
5d2836f9b900
·Adam Roben on Nov 5 2013, 17:37.
Merge pull request #827 from trevorsheridan/master
908bb556d14d
·Adam Roben on Nov 5 2013, 17:36.
Merge pull request #693 from nichtich/patch-1
b5f5b0f2ea6f
·Adam Roben on Nov 5 2013, 17:29.
Merge pull request #434 from Skyr/master
fa55a30a46f3
·Adam Roben on Nov 5 2013, 15:49.
Ignore cache and history (created by SBT >=0.12)
02aa9eb7a8b2
·Stefan Schlott on Nov 5 2013, 07:36.
add a section about not including every template under the sun
ad1a26d50df7
·Coby Chapple on Nov 5 2013, 01:26.
reword one-file-per-commit guideline to be about keeping PRs atomic
ede3453e1493
·Coby Chapple on Nov 5 2013, 01:01.

Nov 4 2013

Merge pull request #526 from bdukes/patch-2
6665f370271c
·Markus Olsson on Nov 4 2013, 23:36.
Cleaning up Objective-C .gitignore and adding OS X section
ebe2e3e57034
·Trevor Sheridan on Nov 4 2013, 23:33.
Merge pull request #780 from juristr/patch-1
3d73f986a6d6
·Brendan Forster on Nov 4 2013, 23:09.
Merge pull request #824 from jamie-humphries/master
c31d59e948cd
·Markus Olsson on Nov 4 2013, 23:06.
Update Scala.gitignore
26367930799f
·Tamir Duberstein on Nov 4 2013, 20:36.
start reworking README to better articulate some contributing guidelines
505a14fbf1d3
·Coby Chapple on Nov 4 2013, 18:36.
Merge pull request #713 from titanous/patch-1
517a44470344
·Adam Roben on Nov 4 2013, 16:18.
Merge remote-tracking branch 'upstream/master'
3523237d7bd0
·James Cowgill on Nov 4 2013, 15:39.
Merge pull request #822 from IconoclastLabs/master
9f14e41dc646
·Adam Roben on Nov 4 2013, 15:37.

Historymastere105d8c4b26e9031691ee3d…

Nov 11 2013

Nov 10 2013

Nov 9 2013

Nov 8 2013

Nov 7 2013

Nov 6 2013

Nov 5 2013

Nov 4 2013

History
mastere105d8c4b26e9031691ee3d…