From 5622f6e35ced71674f85d8c366168bf4711eeaa7 Mon Sep 17 00:00:00 2001 From: Jakobud Date: Fri, 27 Jul 2012 11:28:40 -0600 Subject: [PATCH] Added basic GitHub contribution docs. --- laravel/documentation/contents.md | 10 ++++++++- laravel/documentation/contrib/github.md | 30 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 laravel/documentation/contrib/github.md diff --git a/laravel/documentation/contents.md b/laravel/documentation/contents.md index 14b819a4..7b67f188 100644 --- a/laravel/documentation/contents.md +++ b/laravel/documentation/contents.md @@ -108,4 +108,12 @@ ### Artisan CLI - [Creating & Running Tasks](/docs/artisan/tasks#creating-tasks) - [Bundle Tasks](/docs/artisan/tasks#bundle-tasks) - [CLI Options](/docs/artisan/tasks#cli-options) -- [Commands](/docs/artisan/commands) \ No newline at end of file +- [Commands](/docs/artisan/commands) + +### Contributing + +- [Coding Standards](docs/contrib/coding) +- [Laravel on GitHub](docs/contrib/github) +- [Command Line](docs/contrib/command-line) +- [TortoiseGit](docs/contrib/tortoisegit) + diff --git a/laravel/documentation/contrib/github.md b/laravel/documentation/contrib/github.md new file mode 100644 index 00000000..3ffa734f --- /dev/null +++ b/laravel/documentation/contrib/github.md @@ -0,0 +1,30 @@ +# Laravel on GitHub + +## Contents + +- [The Basics](#the-basics) +- [Repositories](#repositoriess) +- [Branches](#branches) + + +## The Basics + +Because Laravel's development and source control is done through GitHub, anyone is able to make contributions to it. Anyone can fix bugs, add features or improve the documentation. + +After submitting proposed changes to the project, the Laravel project managers will review the changes and make the decision to commit them to Laravel's core. + + +## Repositories + +Laravel's home on GitHub is at [github.com/laravel](https://github.com/laravel). Laravel has several repositories. For basic contributions, the only repository you need to pay attention to is the **laravel** repository, located at [github.com/laravel/laravel](https://github.com/laravel/laravel). + + +## Branches + +The **laravel** repository has multiple branches, each serving a specific purpose: + +- **master** - This is the Laravel release branch. Active development does not happen on this branch. This branch is only for the most recent, stable Laravel core code. When you download Laravel from [laravel.com](http://laravel.com/), you are downloading directly from this master branch. *Do not make pull requests to this branch.* +- **staging** - I'm not sure what this is for... Last minute testing before pushing develop to master? +- **develop** - This is the working development branch. All proposed code changes and contributions by the community are pulled into this branch. *When you make a pull request to the Laravel project, this is the branch you want to pull-request into.* + +Once certain milestones have been reached and Taylor Otwell and other Laravel project managers are happy with the stability and additional features of the current development branch, the changes in the **develop** branch are pulled into the **master** branch, thus creating and releasing the newest stable version of Laravel for the world to use.