]> source.dussan.org Git - gitignore.git/log
gitignore.git
8 years agoAdd .com.apple.timemachine.donotpresent to OSX 1962/head
Manuel Leonhardt [Fri, 6 May 2016 12:27:44 +0000 (14:27 +0200)]
Add .com.apple.timemachine.donotpresent to OSX

.com.apple.timemachine.donotpresent is a system file created by TimeMachine on OSX by user choice.

8 years agoMerge pull request #1956 from jrnold/master 1961/head
Brendan Forster [Sun, 1 May 2016 09:12:58 +0000 (19:12 +1000)]
Merge pull request #1956 from jrnold/master

Add knitr and R markdown patterns to R.gitignore

8 years agoAdd knitr and R markdown patterns to R.gitignore 1956/head
jrnold [Fri, 29 Apr 2016 14:17:44 +0000 (07:17 -0700)]
Add knitr and R markdown patterns to R.gitignore

These patterns handle cache diretories and temporary files created
by the widely used [knitr](http://yihui.name/knitr/) and [R markdown](http://rmarkdown.rstudio.com/)
packages.

8 years agoMerge pull request #1955 from jgm1986/master
Brendan Forster [Thu, 28 Apr 2016 21:52:17 +0000 (07:52 +1000)]
Merge pull request #1955 from jgm1986/master

Update MicrosoftOffice.gitignore

8 years agoComment more clear. 1955/head
Javier Gusano Martinez [Thu, 28 Apr 2016 13:40:02 +0000 (15:40 +0200)]
Comment more clear.

8 years agoExclude Microsoft Visio temporary files.
Javier Gusano Martínez [Wed, 27 Apr 2016 15:44:25 +0000 (17:44 +0200)]
Exclude Microsoft Visio temporary files.

8 years agoMerge pull request #1954 from seungwonpark/patch-1
Brendan Forster [Tue, 26 Apr 2016 04:39:49 +0000 (14:39 +1000)]
Merge pull request #1954 from seungwonpark/patch-1

Update TeX.gitignore

8 years agoUpdate TeX.gitignore 1954/head
Seungwon Park [Tue, 26 Apr 2016 01:30:49 +0000 (10:30 +0900)]
Update TeX.gitignore

When we use 'thmtools' package for creating 'List of Theorems', auxiliary file '.loe' is created, just as '.toc' for 'Table of Contents' and '.lof' for 'List of Figures'.

8 years agoMerge pull request #1953 from 2Cubed/patch-1
Brendan Forster [Tue, 26 Apr 2016 00:49:51 +0000 (10:49 +1000)]
Merge pull request #1953 from 2Cubed/patch-1

Add .webassets-cache to Flask

8 years agoAdd .webassets-cache to Flask 1953/head
2Cubed [Sun, 24 Apr 2016 21:02:02 +0000 (17:02 -0400)]
Add .webassets-cache to Flask

8 years agoMerge pull request #1949 from ro31337/patch-1
Brendan Forster [Thu, 21 Apr 2016 20:44:48 +0000 (06:44 +1000)]
Merge pull request #1949 from ro31337/patch-1

Add nyc test coverage output directory

8 years agoAdd nyc test coverage output directory 1949/head
Roman Pushkin [Thu, 21 Apr 2016 19:01:36 +0000 (12:01 -0700)]
Add nyc test coverage output directory

[nyc](https://github.com/bcoe/nyc) is quite popular, and under some circumstances it writes to `.nyc_output` directory. This directory should be ignored by default.

8 years agoMerge pull request #1948 from dybekm/c_gitignore_update
Brendan Forster [Tue, 19 Apr 2016 21:55:16 +0000 (07:55 +1000)]
Merge pull request #1948 from dybekm/c_gitignore_update

C: Ignore gcc Static Stack Usage Analysis .su files

8 years agoC: Ignore gcc Static Stack Usage Analysis .su files 1948/head
Maik Dybek [Tue, 19 Apr 2016 06:23:51 +0000 (08:23 +0200)]
C: Ignore gcc Static Stack Usage Analysis .su files

8 years agoMerge pull request #1945 from BlueHatbRit/flashdev-to-actionscript
Brendan Forster [Sun, 17 Apr 2016 02:11:17 +0000 (12:11 +1000)]
Merge pull request #1945 from BlueHatbRit/flashdev-to-actionscript

Add FlashDevelop and executables to Actionscript

8 years agoMerge pull request #1943 from elifoster/master
Brendan Forster [Sat, 16 Apr 2016 05:22:11 +0000 (15:22 +1000)]
Merge pull request #1943 from elifoster/master

Ruby: Ignore .env

8 years agoAdd a brief explanation. 1943/head
Eli Clemente Gordillo Foster [Sat, 16 Apr 2016 05:19:36 +0000 (22:19 -0700)]
Add a brief explanation.

8 years agoAdd FlashDevelop and executables to Actionscript 1945/head
Elliot Blackburn [Fri, 15 Apr 2016 10:36:15 +0000 (11:36 +0100)]
Add FlashDevelop and executables to Actionscript

- FlashDevelop uses different file and folder names for it's bin and obj outputs, so those have been added for convenience of devs using that.
- Added a list of some executables that are output by various ways of compiling Actionscript (such as AIR and general Flash).

8 years agoComment out .env rule
Eli Clemente Gordillo Foster [Fri, 15 Apr 2016 04:37:19 +0000 (21:37 -0700)]
Comment out .env rule

8 years agoMerge pull request #1942 from deepak/patch-1
Brendan Forster [Fri, 15 Apr 2016 04:19:14 +0000 (14:19 +1000)]
Merge pull request #1942 from deepak/patch-1

Update Rust.gitignore

8 years agoIgnore .env
Eli Clemente Gordillo Foster [Fri, 15 Apr 2016 04:18:28 +0000 (21:18 -0700)]
Ignore .env

This file is used moderately commonly to store environment variables locally. See Python.gitignore.

8 years agoUpdate Rust.gitignore 1942/head
Deepak Kannan [Fri, 15 Apr 2016 02:14:14 +0000 (07:44 +0530)]
Update Rust.gitignore

no need to specifically ignore compiled files and executables
as it will be under the target directory

8 years agoMerge pull request #1922 from vvolkgang/patch-2
Brendan Forster [Sun, 3 Apr 2016 18:57:04 +0000 (14:57 -0400)]
Merge pull request #1922 from vvolkgang/patch-2

Added Visual Studio 2015 .vs folder

8 years agoMerge pull request #1927 from sachs4/master
Brendan Forster [Sun, 3 Apr 2016 18:55:36 +0000 (14:55 -0400)]
Merge pull request #1927 from sachs4/master

Haskell: Ignore .eventlog files

8 years agoMerge pull request #1929 from geogdog/patch-1
Brendan Forster [Sun, 3 Apr 2016 18:50:05 +0000 (14:50 -0400)]
Merge pull request #1929 from geogdog/patch-1

Added .ropeproject directory

8 years agoAdded .ropeproject directory 1929/head
Greg Trahair [Fri, 1 Apr 2016 08:45:44 +0000 (10:45 +0200)]
Added .ropeproject directory

If anyone uses the ROPE refactoring library this is certainly necessary.

8 years agoMerge pull request #1783 from vladon/Visual-Studio-new-database-engine
Brendan Forster [Thu, 31 Mar 2016 16:23:43 +0000 (09:23 -0700)]
Merge pull request #1783 from vladon/Visual-Studio-new-database-engine

Visual studio new database engine

8 years agoIgnore .eventlog 1927/head
sachs4 [Wed, 30 Mar 2016 11:39:46 +0000 (13:39 +0200)]
Ignore .eventlog

Ignore files produced by GHCs eventlog framework (https://ghc.haskell.org/trac/ghc/wiki/EventLog)

8 years agoMerge pull request #1924 from krzysiekpiasecki/master
Brendan Forster [Sun, 27 Mar 2016 21:14:18 +0000 (14:14 -0700)]
Merge pull request #1924 from krzysiekpiasecki/master

Ignore session files

8 years agoMerge pull request #1923 from rexim/add-cask-dist-folder
Brendan Forster [Sun, 27 Mar 2016 21:01:10 +0000 (14:01 -0700)]
Merge pull request #1923 from rexim/add-cask-dist-folder

Add dist/ folder to Emacs gitignores

8 years agoIgnore session files 1924/head
Krzysztof Piasecki [Sun, 27 Mar 2016 20:03:12 +0000 (22:03 +0200)]
Ignore session files

8 years agoAdd dist/ folder to Emacs gitignores 1923/head
rexim [Sun, 27 Mar 2016 19:16:20 +0000 (01:16 +0600)]
Add dist/ folder to Emacs gitignores

8 years agoRemoved whitespace 1922/head
Álison Fernandes [Sun, 27 Mar 2016 18:52:21 +0000 (19:52 +0100)]
Removed whitespace

Title.

8 years agoAdded Visual Studio 2015 .vs folder
Álison Fernandes [Sun, 27 Mar 2016 18:45:26 +0000 (19:45 +0100)]
Added Visual Studio 2015 .vs folder

Visual Studio 2015 moved all the user specific configuration to a .vs folder, which shouldn't be tracked.

8 years agoMerge pull request #1919 from pmn/update-vs-ignores
Brendan Forster [Sat, 26 Mar 2016 19:23:11 +0000 (12:23 -0700)]
Merge pull request #1919 from pmn/update-vs-ignores

Add an exclusion for Visual Studio PublishScripts

8 years agoAdd an exclusion for PublishScripts 1919/head
Paul Nakata [Fri, 25 Mar 2016 22:21:49 +0000 (15:21 -0700)]
Add an exclusion for PublishScripts

8 years agoMerge pull request #1918 from krzysiekpiasecki/master
Brendan Forster [Fri, 25 Mar 2016 22:06:51 +0000 (15:06 -0700)]
Merge pull request #1918 from krzysiekpiasecki/master

Ignore buckup doctrine entities

8 years agoChange comment 1918/head
Krzysztof Piasecki [Fri, 25 Mar 2016 21:28:27 +0000 (22:28 +0100)]
Change comment

8 years agoIgnore temporary files
Krzysztof Piasecki [Fri, 25 Mar 2016 18:02:38 +0000 (19:02 +0100)]
Ignore temporary files

8 years agoMerge pull request #1913 from lszeremeta/master
Brendan Forster [Mon, 21 Mar 2016 21:31:18 +0000 (08:31 +1100)]
Merge pull request #1913 from lszeremeta/master

More explicit pattern for KBibTeX

8 years agoMore explicit pattern for KBibTeX 1913/head
Łukasz Szeremeta [Mon, 21 Mar 2016 19:10:32 +0000 (20:10 +0100)]
More explicit pattern for KBibTeX

8 years agoMerge pull request #1910 from yanniks/master
Brendan Forster [Mon, 21 Mar 2016 02:02:00 +0000 (12:32 +1030)]
Merge pull request #1910 from yanniks/master

Update fastlane links

8 years agoUpdate fastlane links 1910/head
yanniks [Mon, 21 Mar 2016 01:42:56 +0000 (21:42 -0400)]
Update fastlane links
Fastlane now has a mono repo, the documentation moved into the folder fastlane/docs

8 years agoMerge pull request #1909 from dbburgess/whitespace-fix
Brendan Forster [Fri, 18 Mar 2016 23:05:12 +0000 (09:35 +1030)]
Merge pull request #1909 from dbburgess/whitespace-fix

Remove a trailing whitepsace

8 years agoRemove a trailing whitepsace 1909/head
Daniel Burgess [Fri, 18 Mar 2016 20:34:28 +0000 (16:34 -0400)]
Remove a trailing whitepsace

8 years agoMerge pull request #1908 from evorion/patch-1
Brendan Forster [Wed, 16 Mar 2016 09:27:04 +0000 (20:27 +1100)]
Merge pull request #1908 from evorion/patch-1

Typo in comment

8 years agoTypo in comment 1908/head
evorion [Wed, 16 Mar 2016 09:17:51 +0000 (10:17 +0100)]
Typo in comment

8 years agoMerge pull request #1907 from chrisamanse/patch-1
Brendan Forster [Wed, 16 Mar 2016 01:33:37 +0000 (12:33 +1100)]
Merge pull request #1907 from chrisamanse/patch-1

Update ignore for fastlane files in Swift

8 years agoUpdate ignore for fastlane files in Swift 1907/head
Chris Amanse [Wed, 16 Mar 2016 00:59:27 +0000 (08:59 +0800)]
Update ignore for fastlane files in Swift

8 years agoMerge pull request #1906 from DSIW/patch-1
Brendan Forster [Wed, 16 Mar 2016 00:33:25 +0000 (11:33 +1100)]
Merge pull request #1906 from DSIW/patch-1

Ignore .fot .cb .cb2 for TeX

8 years agoIgnore .fot .cb .cb2 for TeX 1906/head
Max [Tue, 15 Mar 2016 21:28:35 +0000 (22:28 +0100)]
Ignore .fot .cb .cb2 for TeX

8 years agoMerge pull request #1901 from hboon/rubymotion
Brendan Forster [Sun, 13 Mar 2016 07:43:39 +0000 (18:43 +1100)]
Merge pull request #1901 from hboon/rubymotion

Ruby: ignore more build artifacts specific to RubyMotion

8 years agoRuby: Don't ignore vendor/Pods/ for Cocoapods, specific to RubyMotion 1901/head
Hwee-Boon Yar [Sun, 13 Mar 2016 07:35:04 +0000 (15:35 +0800)]
Ruby: Don't ignore vendor/Pods/ for Cocoapods, specific to RubyMotion

8 years agoMerge pull request #1891 from gaaarfild/patch-2
Brendan Forster [Sun, 13 Mar 2016 03:48:07 +0000 (14:48 +1100)]
Merge pull request #1891 from gaaarfild/patch-2

Added nore ignores. Removed.env example file

8 years agoRuby: ignore more build artifacts specific to RubyMotion
Hwee-Boon Yar [Fri, 11 Mar 2016 10:38:43 +0000 (18:38 +0800)]
Ruby: ignore more build artifacts specific to RubyMotion

8 years agoMerge pull request #1899 from e-yes/untrack_virtualenv
Brendan Forster [Thu, 10 Mar 2016 22:10:14 +0000 (09:10 +1100)]
Merge pull request #1899 from e-yes/untrack_virtualenv

Python: don't track virtualenv files.

8 years agoPython: don't track virtualenv files. 1899/head
Alexey Roslyakov [Thu, 10 Mar 2016 10:51:16 +0000 (17:51 +0700)]
Python: don't track virtualenv files.

8 years agoMerge pull request #1897 from Zarkopafilis/patch-1
Brendan Forster [Wed, 9 Mar 2016 20:49:21 +0000 (07:49 +1100)]
Merge pull request #1897 from Zarkopafilis/patch-1

Exclude keystore files (Android/Android Studio .gitignore)

8 years agoMerge pull request #1898 from tim-sueberkrueb/patch-1
Brendan Forster [Wed, 9 Mar 2016 20:46:08 +0000 (07:46 +1100)]
Merge pull request #1898 from tim-sueberkrueb/patch-1

Qt: Insert spaces for consistence

8 years agoQt: Insert spaces for consistence 1898/head
Tim Süberkrüb [Wed, 9 Mar 2016 20:25:12 +0000 (21:25 +0100)]
Qt: Insert spaces for consistence

8 years agoExclude keystore files 1897/head
Theodoros Ntakouris [Wed, 9 Mar 2016 16:30:10 +0000 (18:30 +0200)]
Exclude keystore files

Apart from requiring credentials to function correctly, keystores are sensitive data and are often stored inside the project's directory.

8 years agoMerge pull request #1896 from tpluscode/patch-1
Brendan Forster [Tue, 8 Mar 2016 22:06:17 +0000 (09:06 +1100)]
Merge pull request #1896 from tpluscode/patch-1

ignore folder for non-nuget paket dependencies

8 years agoignore folder for non-nuget paket dependencies 1896/head
Tomasz Pluskiewicz [Tue, 8 Mar 2016 10:03:32 +0000 (11:03 +0100)]
ignore folder for non-nuget paket dependencies

8 years agoCleaned according to comments 1891/head
Dinar Garipov [Mon, 7 Mar 2016 08:58:18 +0000 (09:58 +0100)]
Cleaned according to comments

8 years agoMerge pull request #1878 from toanant/patch-1
Brendan Forster [Mon, 7 Mar 2016 06:26:40 +0000 (17:26 +1100)]
Merge pull request #1878 from toanant/patch-1

Update Python.gitignore for celery-beat schedule binary file.

8 years agoMerge branch 'master' of github.com:github/gitignore into patch-1 1878/head
Abhishek Kumar Singh [Mon, 7 Mar 2016 06:21:09 +0000 (11:51 +0530)]
Merge branch 'master' of github.com:github/gitignore into patch-1

Conflicts:
Python.gitignore

8 years agoMerge pull request #1452 from nunorafaelrocha/enhancement/add-spool-folder
Brendan Forster [Sun, 6 Mar 2016 21:46:42 +0000 (08:46 +1100)]
Merge pull request #1452 from nunorafaelrocha/enhancement/add-spool-folder

Add spool folder to Symfony

8 years agoMerge pull request #1892 from hippo91/master
Brendan Forster [Sun, 6 Mar 2016 20:49:48 +0000 (07:49 +1100)]
Merge pull request #1892 from hippo91/master

No need to push .spyderproject file in a python project

8 years agoMerge pull request #1811 from Caerbannog/master
Brendan Forster [Sun, 6 Mar 2016 20:49:23 +0000 (07:49 +1100)]
Merge pull request #1811 from Caerbannog/master

KiCAD: ignore more temp files and generated data

8 years agoRemove OSX specific rule 1811/head
Martin d'Allens [Sun, 6 Mar 2016 16:20:41 +0000 (17:20 +0100)]
Remove OSX specific rule

8 years agoKiCAD: ignore more temp files and generated data
Martin d'Allens [Fri, 18 Dec 2015 18:07:50 +0000 (19:07 +0100)]
KiCAD: ignore more temp files and generated data

8 years agoNo need to push .spyderproject file in a python project 1892/head
hippo91 [Sun, 6 Mar 2016 11:30:45 +0000 (12:30 +0100)]
No need to push .spyderproject file in a python project

8 years agoAdded nore ignores. Removed.env example file
Dinar Garipov [Sun, 6 Mar 2016 10:51:52 +0000 (11:51 +0100)]
Added nore ignores. Removed.env example file

8 years agoMerge pull request #1764 from psantos10/patch-1
Brendan Forster [Sun, 6 Mar 2016 10:43:28 +0000 (21:43 +1100)]
Merge pull request #1764 from psantos10/patch-1

Update CakePHP.gitignore

8 years agoMerge pull request #1550 from photodude/patch-1
Brendan Forster [Sun, 6 Mar 2016 09:26:29 +0000 (20:26 +1100)]
Merge pull request #1550 from photodude/patch-1

Add the other Dreamweaver added files

8 years agoMerge pull request #1781 from mkutyba/master
Brendan Forster [Sun, 6 Mar 2016 08:28:14 +0000 (19:28 +1100)]
Merge pull request #1781 from mkutyba/master

Fixes for Magento

8 years agoMerge pull request #1707 from jeanCarloMachado/master
Brendan Forster [Sun, 6 Mar 2016 08:23:23 +0000 (19:23 +1100)]
Merge pull request #1707 from jeanCarloMachado/master

Added doctrine 2 orm default cache and proxy locations

8 years agoMerge pull request #1736 from maidmaid/prestashop-cache
Brendan Forster [Sun, 6 Mar 2016 08:18:29 +0000 (19:18 +1100)]
Merge pull request #1736 from maidmaid/prestashop-cache

Update cache files in Prestashop.gitignore

8 years agoMerge pull request #1655 from sourcerer-mike/develop-WordPress
Brendan Forster [Sun, 6 Mar 2016 08:14:41 +0000 (19:14 +1100)]
Merge pull request #1655 from sourcerer-mike/develop-WordPress

WordPress: Only ignore files in root to support other plugins

8 years agoMerge pull request #1684 from jimhester/patch-1
Brendan Forster [Sun, 6 Mar 2016 08:13:35 +0000 (19:13 +1100)]
Merge pull request #1684 from jimhester/patch-1

Ignore output from R CMD build and R CMD check

8 years agoMerge pull request #1664 from littleibex/master
Brendan Forster [Sun, 6 Mar 2016 08:12:42 +0000 (19:12 +1100)]
Merge pull request #1664 from littleibex/master

Added .htaccess to concrete5 gitignore

8 years agoMerge pull request #1624 from wikibootup/master
Brendan Forster [Sun, 6 Mar 2016 08:08:56 +0000 (19:08 +1100)]
Merge pull request #1624 from wikibootup/master

Add Scheme.gitignore

8 years agoMerge pull request #1623 from sorabito/feature/Added_Smalltalk_gitignore
Brendan Forster [Sun, 6 Mar 2016 08:08:28 +0000 (19:08 +1100)]
Merge pull request #1623 from sorabito/feature/Added_Smalltalk_gitignore

Add Smalltalk gitignore

8 years agoMerge pull request #1598 from rdalkire/patch-1
Brendan Forster [Sun, 6 Mar 2016 08:05:43 +0000 (19:05 +1100)]
Merge pull request #1598 from rdalkire/patch-1

Update CVS.gitignore

8 years agoMerge pull request #1543 from barraponto/patch-2
Brendan Forster [Sun, 6 Mar 2016 07:49:45 +0000 (18:49 +1100)]
Merge pull request #1543 from barraponto/patch-2

Add scrapy stuff to .gitignore

8 years agoMerge pull request #1310 from kechol/fuelphp
Brendan Forster [Sun, 6 Mar 2016 07:41:34 +0000 (18:41 +1100)]
Merge pull request #1310 from kechol/fuelphp

Update FuelPHP.gitignore

8 years agoMerge pull request #1807 from rlee287/eclipse-recommender
Brendan Forster [Sun, 6 Mar 2016 07:36:39 +0000 (18:36 +1100)]
Merge pull request #1807 from rlee287/eclipse-recommender

Added Eclipse Recommenders to Eclipse gitignore

8 years agoMerge pull request #1867 from yoLotus/emacs-projectile
Brendan Forster [Sun, 6 Mar 2016 07:35:35 +0000 (18:35 +1100)]
Merge pull request #1867 from yoLotus/emacs-projectile

add .projectile file to emacs .gitignore

8 years agoMerge pull request #1559 from tjrana/dropbox-gitignore
Brendan Forster [Sun, 6 Mar 2016 07:20:27 +0000 (18:20 +1100)]
Merge pull request #1559 from tjrana/dropbox-gitignore

Add Dropbox.gitignore

8 years agoMerge pull request #1889 from aholmes/master
Brendan Forster [Fri, 4 Mar 2016 22:09:11 +0000 (09:09 +1100)]
Merge pull request #1889 from aholmes/master

Remove ApplicationInsights.config from VisualStudio.gitignore

8 years agoRemote ApplicationInsights.config from VisualStudio.gitignore 1889/head
Aaron Holmes [Fri, 4 Mar 2016 21:07:34 +0000 (13:07 -0800)]
Remote ApplicationInsights.config from VisualStudio.gitignore

Commit a25589c92187674f68dcfafe8433e0c1e6069159 introduced an ignore line for ApplicationInsights.config. This change breaks builds on certain systems, namely VSTS.

The current ASP.NET 4 template adds ApplicationInsights.config to the project's .csproj file. When VSTS attempts to build the project, it will fail if it cannot find ApplicationInsights.config.

ApplicationInsights.config is a required application file and should not be ignored.

8 years agoMerge pull request #1885 from roll/patch-1
Brendan Forster [Sun, 28 Feb 2016 21:20:47 +0000 (07:50 +1030)]
Merge pull request #1885 from roll/patch-1

added dotenv to python gitignore

8 years agoadded dotenv to python gitignore 1885/head
roll [Sun, 28 Feb 2016 16:57:21 +0000 (19:57 +0300)]
added dotenv to python gitignore

8 years agoMerge pull request #1882 from aaroncaito/terraform
Brendan Forster [Sat, 27 Feb 2016 01:50:43 +0000 (12:50 +1100)]
Merge pull request #1882 from aaroncaito/terraform

adding terraform state files

8 years agoMerge pull request #1883 from github/shiftkey-patch-1
Brendan Forster [Sat, 27 Feb 2016 01:49:18 +0000 (12:49 +1100)]
Merge pull request #1883 from github/shiftkey-patch-1

adding a template to help streamline review process

8 years agoadding a template to help streamline review process 1883/head
Brendan Forster [Sat, 27 Feb 2016 01:48:40 +0000 (12:48 +1100)]
adding a template to help streamline review process

8 years agoadding terraform state files 1882/head
aaron caito [Fri, 26 Feb 2016 16:54:57 +0000 (11:54 -0500)]
adding terraform state files

8 years agoMerge pull request #1686 from czechboy0/keep-scm-files
Brendan Forster [Fri, 26 Feb 2016 00:18:34 +0000 (11:18 +1100)]
Merge pull request #1686 from czechboy0/keep-scm-files

Removed xccheckout and xcscmblueprint from Swift/Objc/Xcode

8 years agoMerge branch 'master' of github.com:github/gitignore into keep-scm-files 1686/head
Honza Dvorsky [Fri, 26 Feb 2016 00:07:20 +0000 (00:07 +0000)]
Merge branch 'master' of github.com:github/gitignore into keep-scm-files

# Conflicts:
# Objective-C.gitignore
# Swift.gitignore

8 years agoMerge pull request #1871 from guenti/master
Brendan Forster [Thu, 25 Feb 2016 21:18:26 +0000 (08:18 +1100)]
Merge pull request #1871 from guenti/master

Update Vim.gitignore