]> source.dussan.org Git - gitignore.git/log
gitignore.git
10 years agoMust ignore x86 directory as well 1116/head
Adilson Carvalho [Wed, 18 Jun 2014 12:15:02 +0000 (09:15 -0300)]
Must ignore x86 directory as well

When installing SQLite embebed on my C# project I've noted that it generates both directories,
`x86` and `x64` but only `x64` was present on `.gitignore`.

10 years agoMerge pull request #1115 from ahmyi/patch-1
Carl Suster [Wed, 18 Jun 2014 03:46:37 +0000 (13:46 +1000)]
Merge pull request #1115 from ahmyi/patch-1

Update Unity.gitignore to ignore sysinfo crash log

10 years agoUpdate Unity.gitignore 1115/head
ahmyi [Tue, 17 Jun 2014 18:12:59 +0000 (02:12 +0800)]
Update Unity.gitignore

Sysinfo.txt is generated by unity if occurs any crashes. The content consist of  users system information, running process etc. I don't think that should be shared with others.

10 years agoGet rid of the space in the filename
Carl Suster [Thu, 12 Jun 2014 01:48:15 +0000 (11:48 +1000)]
Get rid of the space in the filename

Amends #976

10 years agoMerge commit 'refs/pull/976'
Carl Suster [Thu, 12 Jun 2014 01:47:29 +0000 (11:47 +1000)]
Merge commit 'refs/pull/976'

10 years agoGrammar/formatting tweak to comments
Carl Suster [Thu, 12 Jun 2014 01:40:58 +0000 (11:40 +1000)]
Grammar/formatting tweak to comments

Fixes #897 with amendment

10 years agoadd Meta Programming System gitignore files
Kolja Dummann [Sun, 15 Dec 2013 17:44:00 +0000 (18:44 +0100)]
add Meta Programming System gitignore files

The Meta Programming System is a language workbench created by JetBrains.

http://jetbrains.com/mps/

By default this file will ignore the generated java source and the compiled java classes that are
produced by the language compiler. It will only add the Models which contain all information
necessary to reproduce the the java source code and the the resulting class files.

In addition to the generated source code it will ignore the test result files and test property files,
because those are also generated from the models.

The ignore file also prevents commiting the workspace.xml which contains the currently editor state,
like open files and cursor position.

10 years agoMerge pull request #1101 from kargakis/patch-1
Carl Suster [Thu, 12 Jun 2014 01:25:19 +0000 (11:25 +1000)]
Merge pull request #1101 from kargakis/patch-1

Ignore profile files

10 years agoIgnore profile files 1101/head
Michalis Kargakis [Fri, 6 Jun 2014 13:53:21 +0000 (16:53 +0300)]
Ignore profile files

10 years agoMerge pull request #1095 from Heather/patch-1
Carl Suster [Fri, 30 May 2014 05:56:17 +0000 (15:56 +1000)]
Merge pull request #1095 from Heather/patch-1

New template for Rust

10 years agogitignore for Rust 1095/head
Heather [Fri, 30 May 2014 05:51:56 +0000 (22:51 -0700)]
gitignore for Rust

10 years agoRe-order rules for JetBrains legacy project format
Daniel Rothmaler [Thu, 29 May 2014 01:13:13 +0000 (11:13 +1000)]
Re-order rules for JetBrains legacy project format

Fixes #1090 - this is the part of that PR that seems justified.

10 years agoMerge pull request #1092 from Arvur/master
Carl Suster [Thu, 29 May 2014 00:51:08 +0000 (10:51 +1000)]
Merge pull request #1092 from Arvur/master

One more binary type to ignore

10 years agoOne more binary type to ignore 1092/head
Denis Grinyuk [Wed, 28 May 2014 11:47:56 +0000 (15:47 +0400)]
One more binary type to ignore

10 years agoMerge pull request #1091 from nicwortel/update-symfony2
Carl Suster [Wed, 28 May 2014 10:26:02 +0000 (20:26 +1000)]
Merge pull request #1091 from nicwortel/update-symfony2

Update .gitignore for Symfony2

10 years agoRename Assets section 1091/head
Nic Wortel [Wed, 28 May 2014 10:23:42 +0000 (12:23 +0200)]
Rename Assets section

10 years agoRename Composer section
Nic Wortel [Wed, 28 May 2014 10:22:34 +0000 (12:22 +0200)]
Rename Composer section

10 years agoMove bootstrap file to "Managed by Composer" section
Nic Wortel [Wed, 28 May 2014 10:21:56 +0000 (12:21 +0200)]
Move bootstrap file to "Managed by Composer" section

10 years agoRename "Dependencies" section into "Managed by Composer"
Nic Wortel [Wed, 28 May 2014 10:21:08 +0000 (12:21 +0200)]
Rename "Dependencies" section into "Managed by Composer"

10 years agoReorder entries
Nic Wortel [Wed, 28 May 2014 10:02:45 +0000 (12:02 +0200)]
Reorder entries

10 years agoKeep cache and logs directories
Nic Wortel [Wed, 28 May 2014 09:58:44 +0000 (11:58 +0200)]
Keep cache and logs directories

10 years agoAdd leading slashes
Nic Wortel [Wed, 28 May 2014 09:57:41 +0000 (11:57 +0200)]
Add leading slashes

10 years agoIgnore bin folder
Nic Wortel [Wed, 28 May 2014 09:53:46 +0000 (11:53 +0200)]
Ignore bin folder

10 years agoReplace app/bootstrap wildcard with explicit entry
Nic Wortel [Wed, 28 May 2014 09:41:45 +0000 (11:41 +0200)]
Replace app/bootstrap wildcard with explicit entry

See https://github.com/symfony/symfony-standard/commit/e7b7b0f366465b15a29f44d7ba17287bb0b8392b

10 years agoMerge pull request #1069 from github/sbt
Carl Suster [Mon, 26 May 2014 01:32:52 +0000 (11:32 +1000)]
Merge pull request #1069 from github/sbt

[Global/SBT] Fix documentation URL

10 years agoMerge pull request #1085 from giosh94mhz/symfony2_ignore_phpunit_xml
Carl Suster [Mon, 26 May 2014 01:29:06 +0000 (11:29 +1000)]
Merge pull request #1085 from giosh94mhz/symfony2_ignore_phpunit_xml

Ignore phpunit.xml in Symfony2 applications

10 years agoMerge pull request #1079 from sebgod/mercury-add-beams
Carl Suster [Mon, 26 May 2014 01:26:48 +0000 (11:26 +1000)]
Merge pull request #1079 from sebgod/mercury-add-beams

Mercury.gitignore: Add Erlang .beams,

10 years agoMerge pull request #1078 from jamesottaway/patch-1
Carl Suster [Mon, 26 May 2014 01:24:16 +0000 (11:24 +1000)]
Merge pull request #1078 from jamesottaway/patch-1

Ignore locally-built `*.nupkg` files

10 years agoIgnore phpunit.xml in Symfony2 applications 1085/head
Giorgio Premi [Tue, 20 May 2014 13:51:47 +0000 (15:51 +0200)]
Ignore phpunit.xml in Symfony2 applications

10 years agoMercury.gitignore: Add Erlang .beams, as this is an 1079/head
Sebastian Godelet [Mon, 12 May 2014 08:00:08 +0000 (10:00 +0200)]
Mercury.gitignore: Add Erlang .beams, as this is an
additional compiler target, forgot to add this in
https://github.com/github/gitignore/pull/1057

10 years agoIgnore locally-built `*.nupkg` files 1078/head
James Ottaway [Mon, 12 May 2014 00:36:23 +0000 (10:36 +1000)]
Ignore locally-built `*.nupkg` files

Building NuGet packages locally with `NuGet.exe pack <name>.nuspec` generates a `<name>.<version>.nupkg` file which should never be versioned.

10 years agoMerge pull request #886 from acelaya/zf2
Carl Suster [Sun, 11 May 2014 11:05:46 +0000 (21:05 +1000)]
Merge pull request #886 from acelaya/zf2

Zend Framework 2 gitignore file

10 years agoZendFramework2.gitignore renamed to ZendFramework.gitignore 886/head
Alejandro Celaya [Sun, 11 May 2014 11:01:13 +0000 (13:01 +0200)]
ZendFramework2.gitignore renamed to ZendFramework.gitignore

10 years agoIncluded Zend Framework 1 rules
Alejandro Celaya [Sun, 11 May 2014 11:00:31 +0000 (13:00 +0200)]
Included Zend Framework 1 rules

10 years agoRemoved old ZendFramework.gitignore
Alejandro Celaya [Sun, 11 May 2014 10:59:57 +0000 (12:59 +0200)]
Removed old ZendFramework.gitignore

Documentation rules have been removed and the rest of the rules are going to be included in the ZendFramework2.gitignore.

10 years agoMerge pull request #1076 from stakisko/patch-1
Carl Suster [Sat, 10 May 2014 06:40:27 +0000 (16:40 +1000)]
Merge pull request #1076 from stakisko/patch-1

"TheFind Feed" module removed

10 years ago"TheFind Feed" module removed 1076/head
Konstantinos Bariotis [Thu, 8 May 2014 13:46:54 +0000 (16:46 +0300)]
"TheFind Feed" module removed

According to [this](http://www.magentocommerce.com/magento-connect/thefind-feed-1.html) TheFind Feed module does not come with the latest versions of Magento( > 1.6).

Thank you

10 years agoMerge pull request #1074 from github/ignore-lock-wscript
Scott J. Roberts [Wed, 7 May 2014 21:58:28 +0000 (17:58 -0400)]
Merge pull request #1074 from github/ignore-lock-wscript

Adding .lock-wscript

10 years agoAdding .lock-wscript 1074/head
Scott J. Roberts [Wed, 7 May 2014 21:47:05 +0000 (17:47 -0400)]
Adding .lock-wscript

10 years agoMerge pull request #1029 from cheddar/patch-1
Carl Suster [Wed, 7 May 2014 11:37:06 +0000 (21:37 +1000)]
Merge pull request #1029 from cheddar/patch-1

Tweak comment in Node.js .gitignore file

10 years agoMerge pull request #1070 from matma/master
Carl Suster [Wed, 7 May 2014 11:27:02 +0000 (21:27 +1000)]
Merge pull request #1070 from matma/master

Releases should also be ignored

10 years agoRemove stray whitespace
Carl Suster [Wed, 7 May 2014 11:22:24 +0000 (21:22 +1000)]
Remove stray whitespace

Amending #1072

10 years agoMerge commit 'refs/pull/1072'
Carl Suster [Wed, 7 May 2014 11:21:25 +0000 (21:21 +1000)]
Merge commit 'refs/pull/1072'

10 years agoReleases should be ignored 1070/head
Mateusz Wolsza [Wed, 7 May 2014 11:14:53 +0000 (13:14 +0200)]
Releases should be ignored

10 years agoMerge pull request #1071 from RX14/patch-1
Carl Suster [Wed, 7 May 2014 11:06:22 +0000 (21:06 +1000)]
Merge pull request #1071 from RX14/patch-1

Update Gradle.gitignore

10 years agoadded gitignore for IPython notebooks 1072/head
rasbt [Tue, 6 May 2014 18:48:13 +0000 (14:48 -0400)]
added gitignore for IPython notebooks

10 years agoadded gitignore for IPython notebooks
rasbt [Tue, 6 May 2014 18:47:52 +0000 (14:47 -0400)]
added gitignore for IPython notebooks

10 years agoUpdate Gradle.gitignore 1071/head
RX14 [Tue, 6 May 2014 16:06:01 +0000 (17:06 +0100)]
Update Gradle.gitignore

Update Gradle.gitignore

10 years agoReleases should also be ignored
Mateusz Wolsza [Tue, 6 May 2014 10:10:00 +0000 (12:10 +0200)]
Releases should also be ignored

"Releases" directory is created by Shimmer/Squirrel installer for example. It also should be ignored.

10 years agoMerge branch 'fix-1013'
Carl Suster [Tue, 6 May 2014 07:42:36 +0000 (17:42 +1000)]
Merge branch 'fix-1013'

I made some changes to the original pull request to remove complexity which
I believe was not needed.

10 years agoShorten note in comment at the top
Carl Suster [Tue, 6 May 2014 07:42:22 +0000 (17:42 +1000)]
Shorten note in comment at the top

10 years agoRemove redundant Umbraco exceptions to VS rules
Carl Suster [Tue, 6 May 2014 07:38:57 +0000 (17:38 +1000)]
Remove redundant Umbraco exceptions to VS rules

From the discussion on #1013:

Since the rule in VS is packages/*, the fact that it contains a slash means
that it is anchored to the top level. That is, is will only apply to
a directory called packages at the top level, and not to any at deeper
directories like App_Data. So these rules at the bottom of your changes
actually aren't necessary after all. I just confirmed this with a quick test.

10 years agoMerge pull request #958 from arcresu/python-bin
Carl Suster [Tue, 6 May 2014 07:31:14 +0000 (17:31 +1000)]
Merge pull request #958 from arcresu/python-bin

[Python] Remove rules for bin/, Mr Developer, and Rope

10 years agoFix URL in SBT template 1069/head
Carl Suster [Tue, 6 May 2014 07:19:27 +0000 (17:19 +1000)]
Fix URL in SBT template

10 years agoMerge pull request #1066 from FuriKuri/master
Carl Suster [Tue, 6 May 2014 07:09:58 +0000 (17:09 +1000)]
Merge pull request #1066 from FuriKuri/master

Add new .gitignore for Elixir

10 years agoAdd .gitignore for Elixir 1066/head
Theo Pack [Sun, 4 May 2014 16:27:23 +0000 (18:27 +0200)]
Add .gitignore for Elixir

10 years agoMerge pull request #1057 from sebgod/master
Carl Suster [Tue, 29 Apr 2014 10:44:35 +0000 (20:44 +1000)]
Merge pull request #1057 from sebgod/master

add Mercury language gitignore template

10 years agoremoved Vim and ctags specific ignores; as these are handled in Global/ 1057/head
Sebastian Godelet [Tue, 29 Apr 2014 10:15:00 +0000 (12:15 +0200)]
removed Vim and ctags specific ignores; as these are handled in Global/

10 years agoMerge pull request #1051 from bohdan4ik/patch-1
Carl Suster [Tue, 29 Apr 2014 01:44:39 +0000 (11:44 +1000)]
Merge pull request #1051 from bohdan4ik/patch-1

Splitted large comments into a few lines

10 years agoadd Mercury language gitignore template
Sebastian Godelet [Sun, 27 Apr 2014 11:06:27 +0000 (13:06 +0200)]
add Mercury language gitignore template

10 years agoMerge pull request #1046 from stenskjaer/patch-1
Carl Suster [Sun, 27 Apr 2014 01:24:13 +0000 (11:24 +1000)]
Merge pull request #1046 from stenskjaer/patch-1

Ignore auctex auto-folder and contents

10 years agoComposer.lock and READMEs are no longer ignored
Alejandro Celaya [Fri, 25 Apr 2014 06:13:24 +0000 (08:13 +0200)]
Composer.lock and READMEs are no longer ignored

10 years agoMerge pull request #1056 from kylef/patch-2
Carl Suster [Thu, 24 Apr 2014 14:14:43 +0000 (00:14 +1000)]
Merge pull request #1056 from kylef/patch-2

[Objective-C] Fixes a broken link

10 years ago[Objective-C] Fixes a broken link 1056/head
Kyle Fuller [Thu, 24 Apr 2014 14:01:04 +0000 (15:01 +0100)]
[Objective-C] Fixes a broken link

This got changed recently.

10 years agoMerge pull request #1045 from DaikiMaekawa/master
Carl Suster [Thu, 24 Apr 2014 02:51:19 +0000 (12:51 +1000)]
Merge pull request #1045 from DaikiMaekawa/master

Fixed that the ROS.gitignore was not functioning properly

10 years agoMerge pull request #1055 from PR3x/master
Carl Suster [Thu, 24 Apr 2014 02:49:55 +0000 (12:49 +1000)]
Merge pull request #1055 from PR3x/master

Fix EOL issues in multiple gitignores

10 years agoFix eol issues 1055/head
Jacob Rigby [Wed, 23 Apr 2014 20:50:28 +0000 (15:50 -0500)]
Fix eol issues

Some files don't contain a line separator ('\n') at the end. Add the
missing eol.

In POSIX, all lines of text should end with a newline character by
definition. See
http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html
section 3.397 for more.

See https://gist.github.com/jacknagel/1020172 for a gist of the issue.

10 years agoRemove unnecessary rules 1045/head
DaikiMaekawa [Wed, 23 Apr 2014 11:46:03 +0000 (20:46 +0900)]
Remove unnecessary rules

10 years agoSplitted large comments into a few lines 1051/head
Bohdan Shulha [Wed, 23 Apr 2014 07:59:33 +0000 (10:59 +0300)]
Splitted large comments into a few lines

10 years agoMerge pull request #1049 from szpssky/szp
Carl Suster [Wed, 23 Apr 2014 06:52:57 +0000 (16:52 +1000)]
Merge pull request #1049 from szpssky/szp

Add ignore log files(Android)

10 years agoMerge pull request #1043 from Pilchie/master
Markus Olsson [Wed, 23 Apr 2014 06:50:09 +0000 (16:50 +1000)]
Merge pull request #1043 from Pilchie/master

Add trailing / for Roslyn cache directories

10 years agoadd ignore log files(Android) 1049/head
szp [Sat, 19 Apr 2014 12:40:57 +0000 (20:40 +0800)]
add ignore log files(Android)

10 years agoMerge pull request #1048 from grossadamm/patch-1
Carl Suster [Sat, 19 Apr 2014 00:05:38 +0000 (10:05 +1000)]
Merge pull request #1048 from grossadamm/patch-1

Simple grammar update

10 years agoChanging been to being per https://github.com/tmountjr 1048/head
Adam Gross [Fri, 18 Apr 2014 17:32:38 +0000 (13:32 -0400)]
Changing been to being per https://github.com/tmountjr

10 years agoSimple grammar update
Adam Gross [Fri, 18 Apr 2014 17:19:46 +0000 (13:19 -0400)]
Simple grammar update

10 years agoIgnor auctex auto-folder and contents 1046/head
Michael S. Christensen [Thu, 17 Apr 2014 16:21:11 +0000 (18:21 +0200)]
Ignor auctex auto-folder and contents

When working with multifile LaTeX-documents in AUCTeX in emacs, it creates the auto-folder to keep track of styles, macros etc. in the whole document. Unnecessary of versioning purposes.

10 years agoFixed typo
DaikiMaekawa [Thu, 17 Apr 2014 12:08:18 +0000 (21:08 +0900)]
Fixed typo

10 years agoAdd trailing / for Roslyn cache directories 1043/head
Kevin Pilch-Bisson [Thu, 17 Apr 2014 02:43:13 +0000 (19:43 -0700)]
Add trailing / for Roslyn cache directories

10 years agoMerge pull request #1040 from NSElvis/master
Carl Suster [Wed, 16 Apr 2014 07:55:38 +0000 (17:55 +1000)]
Merge pull request #1040 from NSElvis/master

Ignore xcuserstate

10 years agoMerge pull request #1042 from stenskjaer/patch-1
Carl Suster [Wed, 16 Apr 2014 07:50:47 +0000 (17:50 +1000)]
Merge pull request #1042 from stenskjaer/patch-1

Added .rel for reftex to Emacs template

10 years agoAdded .rel-files 1042/head
Michael S. Christensen [Wed, 16 Apr 2014 06:51:19 +0000 (08:51 +0200)]
Added .rel-files

Reftex adds these for internal processing, only auxillary files for composition and compilation of tex-documents.

10 years agoMerge pull request #1041 from UltraWalker/feature/add_laravel4_framework
Carl Suster [Wed, 16 Apr 2014 04:39:51 +0000 (14:39 +1000)]
Merge pull request #1041 from UltraWalker/feature/add_laravel4_framework

Add Laravel4 gitignore template

10 years agoLaravel4 gitignore 1041/head
Alireza Zabandan [Wed, 16 Apr 2014 00:05:10 +0000 (04:35 +0430)]
Laravel4 gitignore

10 years agoIgnore xcuserstate 1040/head
Elvis Nuñez [Tue, 15 Apr 2014 16:59:29 +0000 (18:59 +0200)]
Ignore xcuserstate

xcuserstate files are generated from within Xcode and saved in your project bundle to remember your last opened file, the open state of any group folders, open tabs, and any other user setting your project might need to remember, this is something that shouldn't be tracked in version control

10 years agoIgnore xcuserstate
Elvis Nuñez [Tue, 15 Apr 2014 16:56:25 +0000 (18:56 +0200)]
Ignore xcuserstate

xcuserstate files are generated from within Xcode and saved in your project bundle to remember your last opened file, the open state of any group folders, open tabs, and any other user setting your project might need to remember

10 years agoMerge pull request #1038 from superlukas/osx-comment
Carl Suster [Tue, 15 Apr 2014 14:42:03 +0000 (00:42 +1000)]
Merge pull request #1038 from superlukas/osx-comment

Fixed typo in comment

10 years agoFixed typo in comment 1038/head
Lukas Böcker [Tue, 15 Apr 2014 14:19:56 +0000 (16:19 +0200)]
Fixed typo in comment

10 years agoMerge pull request #1035 from AArnott/master
Carl Suster [Tue, 15 Apr 2014 02:52:29 +0000 (12:52 +1000)]
Merge pull request #1035 from AArnott/master

Adds Roslyn .ide directories to .gitignore.

10 years agoAdds Roslyn .ide directories to .gitignore. 1035/head
Andrew Arnott [Mon, 14 Apr 2014 13:02:29 +0000 (06:02 -0700)]
Adds Roslyn .ide directories to .gitignore.

10 years agoMerge pull request #1008 from maieul/master
Carl Suster [Mon, 14 Apr 2014 03:41:01 +0000 (13:41 +1000)]
Merge pull request #1008 from maieul/master

Add rules for TeX packages (e)ledmac and (e)ledpar. References from manuals:

eledmac p. 46:
> Each section will read and write an associated "line-list file", containing information used to do the numbering; the file will be called `<jobname>.nn`, where `nn` is the section number. However, you may direct that an extra string be added before the `nn` in that filename, in order to distinguish these temporary files from others: that string is called `\extensionchars`. Initially it's empty, since different operating systems have greatly varying ideas about what characters are permitted in file names. So `\renewcommand{\extensionchars}{-}` gives temporary files called `<jobname>.-1`, `<jobname>.-2`, etc.

eledmac p. 112:
> Endnotes of all varieties are saved up in a file, typically named `<jobname>.end`.

eledpar p.8:
> The `\beginnumbering` macro resets the line number to zero, reads an auxiliary file called `<jobname>.nn` (where `<jobname>` is the name of the main input file for this job, and `nn` is 1 for the first numbered section, 2 for the second section, and so on), and then creates a new version of this auxiliary file to collect information during this run. Separate auxiliary files are maintained for right hand texts and these are named `<jobname>.nnR`, using the ‘R’ to distinguish them from the left hand and serial (non-parallel) texts.

10 years agoimprove umbraco ignores 1013/head
Ben Bodenmiller [Sun, 13 Apr 2014 20:53:34 +0000 (13:53 -0700)]
improve umbraco ignores

10 years agoMerge pull request #1033 from carpii/osx_tweak
Carl Suster [Sat, 12 Apr 2014 12:25:09 +0000 (22:25 +1000)]
Merge pull request #1033 from carpii/osx_tweak

Ignore more osx/afp clutter

10 years agoIgnore more osx/afp clutter 1033/head
Carpii (iMac) [Fri, 11 Apr 2014 12:20:47 +0000 (13:20 +0100)]
Ignore more osx/afp clutter

10 years agoMerge pull request #1031 from teslitsky/master
Carl Suster [Fri, 11 Apr 2014 01:05:02 +0000 (11:05 +1000)]
Merge pull request #1031 from teslitsky/master

Tighten OpenCart.gitignore config rule

10 years agoMerge pull request #1032 from ohnit/VisualStudioRevertPackage
Carl Suster [Fri, 11 Apr 2014 01:03:09 +0000 (11:03 +1000)]
Merge pull request #1032 from ohnit/VisualStudioRevertPackage

Revert "Packages folder is ignored correctly".

10 years agoRevert "Packages folder is ignored correctly". 1032/head
Justin Howlett [Thu, 10 Apr 2014 17:57:55 +0000 (13:57 -0400)]
Revert "Packages folder is ignored correctly".
Without the asterisk at the end of the directory's path, an exception for
a file within this directory does not work.
(ex. !packages/repositories.config)

This reverts commit 0fb0fbefa5fcd62ea5b6fe0f433588df270dcd71.

10 years agoReturned lost config file 1031/head
Dmitry Teslitsky [Tue, 8 Apr 2014 15:48:50 +0000 (18:48 +0300)]
Returned lost config file

OpenCart has engine file system/library/config.php that must be in version control.

10 years agoMerge pull request #1 from github/master
Dmitry Teslitsky [Tue, 8 Apr 2014 15:38:13 +0000 (18:38 +0300)]
Merge pull request #1 from github/master

Updating fork

10 years agoMerge branch 'fix-1022'
Carl Suster [Sun, 6 Apr 2014 00:38:40 +0000 (10:38 +1000)]
Merge branch 'fix-1022'

Restore the Xcode rules to the Objective-C template as per the discussion
thread on 5bd4330. Although the rules correspond to an IDE and so are
global, most users of the Obj-C template expect to find the Xcode rules
in the template generated by github.com, since the IDE is so ubiquitous.

This could possibly be resolved by adding a template transclusion
mechanism in the future, but for now duplication is the way to go.

10 years agoRemove Obj-C-specific hmap & ipa from general Xcode template
Carl Suster [Sun, 6 Apr 2014 00:38:24 +0000 (10:38 +1000)]
Remove Obj-C-specific hmap & ipa from general Xcode template