8000 Merge pull request #1112 from HiroKws/fix-markdown/git-docs · allforweb/laravel@5e11cb9 · GitHub
[go: up one dir, main page]

Ski 8000 p to content

Commit 5e11cb9

Browse files
committed
Merge pull request laravel#1112 from HiroKws/fix-markdown/git-docs
Change some Markdown to fit other md files' format.
2 parents b3319f5 + 973551c commit 5e11cb9

File tree

2 files changed

+61
-59
lines changed

2 files changed

+61
-59
lines changed

laravel/documentation/contrib/command-line.md

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,29 @@
11
# Contributing to Laravel via Command-Line
22

33
## Contents
4-
- [Getting Started](#getting-started)
5-
- [Forking Laravel](#forking-laravel)
6-
- [Cloning Laravel](#cloning-laravel)
7-
- [Adding your Fork](#adding-your-fork)
8-
- [Creating Branches](#creating-branches)
9-
- [Committing](#committing)
10-
- [Submitting a Pull Request](#submitting-a-pull-request)
11-
- [What's Next?](#whats-next)
12-
13-
<a name='getting-started'></a>
4+
5+
- [Getting Started](#getting-started)
6+
- [Forking Laravel](#forking-laravel)
7+
- [Cloning Laravel](#cloning-laravel)
8+
- [Adding your Fork](#adding-your-fork)
9+
- [Creating Branches](#creating-branches)
10+
- [Committing](#committing)
11+
- [Submitting a Pull Request](#submitting-a-pull-request)
12+
- [What's Next?](#whats-next)
13+
14+
<a name="getting-started"></a>
1415
## Getting Started
1516

1617
This tutorial explains the basics of contributing to a project on [GitHub](https://github.com/) via the command-line. The workflow can apply to most projects on GitHub, but in this case, we will be focused on the [Laravel](https://github.com/laravel/laravel) project. This tutorial is applicable to OSX, Linux and Windows.
1718

1819
This tutorial assumes you have installed [Git](http://git-scm.com/) and you have created a [GitHub account](https://github.com/signup/free). If you haven't already, look at the [Laravel on GitHub](/docs/contrib/github) documentation in order to familiarize yourself with Laravel's repositories and branches.
1920

20-
<a name='forking-laravel'></a>
21+
<a name="forking-laravel"></a>
2122
## Forking Laravel
2223

2324
Login to GitHub and visit the [Laravel Repository](https://github.com/laravel/laravel). Click on the **Fork** button. This will create your own fork of Laravel in your own GitHub account. Your Laravel fork will be located at **https://github.com/username/laravel** (your GitHub username will be used in place of *username*).
2425

25-
<a name='cloning-laravel'></a>
26+
<a name="cloning-laravel"></a>
2627
## Cloning Laravel
2728

2829
Open up the command-line or terminal and make a new directory where you can make development changes to Laravel:
@@ -36,7 +37,7 @@ Next, clone the Laravel repository (not your fork you made):
3637

3738
> **Note**: The reason you are cloning the o EDBE riginal Laravel repository (and not the fork you made) is so you can always pull down the most recent changes from the Laravel repository to your local repository.
3839
39-
<a name='adding-your-fork'></a>
40+
<a name="adding-your-fork"></a>
4041
## Adding your Fork
4142

4243
Next, it's time to add the fork you made as a **remote repository**:
@@ -49,7 +50,7 @@ Remember to replace *username** with your GitHub username. *This is case-sensiti
4950

5051
Now you have a pristine clone of the Laravel repository along with your fork as a remote repository. You are ready to begin branching for new features or fixing bugs.
5152

52-
<a name='creating-branches'></a>
53+
<a name="creating-branches"></a>
5354
## Creating Branches
5455

5556
First, make sure you are working in the **develop** branch. If you submit changes to the **master** branch, it is unlikely they will be pulled in anytime in the near future. For more information on this, read the documentation for [Laravel on GitHub](/docs/contrib/github). To switch to the develop branch:
@@ -76,7 +77,7 @@ Or if there is a new feature to add or change to the documentation that you want
7677
7778
Now that you have created your own branch and have switched to it, it's time to make your changes to the code. Add your new feature or fix that bug.
7879

79-
<a name='committing'></a>
80+
<a name="committing"></a>
8081
## Committing
8182

8283
Now that you have finished coding and testing your changes, it's time to commit them to your local repository. First, add the files that you changed/added:
@@ -87,10 +88,10 @@ Next, commit the changes to the repository:
8788

8889
# git commit -s -m "I added some more stuff to the Localization documentation."
8990

90-
- **-s** means that you are signing-off on your commit with your name. This tells the Laravel team know that you personally agree to your code being added to the Laravel core.
91-
- **-m** is the message that goes with your commit. Provide a brief explanation of what you added or changed.
91+
"- **-s** means that you are signing-off on your commit with your name. This tells the Laravel team know that you personally agree to your code being added to the Laravel core.
92+
"- **-m** is the message that goes with your commit. Provide a brief explanation of what you added or changed.
9293

93-
<a name='pushing-to-your-fork'></a>
94+
<a name="pushing-to-your-fork"></a>
9495
## Pushing to your Fork
9596

9697
Now that your local repository has your committed changes, it's time to push (or sync) your new branch to your fork that is hosted in GitHub:
@@ -99,19 +100,19 @@ Now that your local repository has your committed changes, it's time to push (or
99100

100101
Your branch has been successfully pushed to your fork on GitHub.
101102

102-
<a name='submitting-a-pull-request'></a>
103+
<a name="submitting-a-pull-request"></a>
103104
## Submitting a Pull Request
104105

105106
The final step is to submit a pull request to the Laravel repository. This means that you are requesting that the Laravel team pull and merge your changes to the Laravel core. In your browser, visit your Laravel fork at [https://github.com/username/laravel](https://github.com/username/laravel). Click on **Pull Request**. Next, make sure you choose the proper base and head repositories and branches:
106107

107-
- **base repo:** laravel/laravel
108-
- **base branch:** develop
109-
- **head repo:** username/laravel
110-
- **head branch:** feature/localization-docs
108+
- **base repo:** laravel/laravel
109+
- **base branch:** develop
110+
- **head repo:** username/laravel
111+
- **head branch:** feature/localization-docs
111112

112113
Use the form to write a more detailed description of the changes you made and why you made them. Finally, click **Send pull request**. That's it! The changes you made have been submitted to the Laravel team.
113114

114-
<a name='whats-next'></a>
115+
<a name="whats-next"></a>
115116
## What's Next?
116117

117118
Do you have another feature you want to add or another bug you need to fix? First, make sure you always base your new branch off of the develop branch:
Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,61 @@
11
# Contributing to Laravel using TortoiseGit
22

33
## Contents
4-
- [Getting Started](#getting-started)
5-
- [Forking Laravel](#forking-laravel)
6-
- [Cloning Laravel](#cloning-laravel)
7-
- [Adding your Fork](#adding-your-fork)
8-
- [Creating Branches](#creating-branches)
9-
- [Committing](#committing)
10-
- [Submitting a Pull Request](#submitting-a-pull-request)
11-
- [What's Next?](#whats-next)
12-
13-
<a name='getting-started'></a>
4+
5+
- [Getting Started](#getting-started)
6+
- [Forking Laravel](#forking-laravel)
7+
- [Cloning Laravel](#cloning-laravel)
8+
- [Adding your Fork](#adding-your-fork)
9+
- [Creating Branches](#creating-branches)
10+
- [Committing](#committing)
11+
- [Submitting a Pull Request](#submitting-a-pull-request)
12+
- [What's Next?](#whats-next)
13+
14+
<a name="getting-started"></a>
1415
## Getting Started
1516

1617
This tutorial explains the basics of contributing to a project on [GitHub](https://github.com/) using [TortoiseGit](http://code.google.com/p/tortoisegit/) for Windows. The workflow can apply to most projects on GitHub, but in this case, we will be focused on the [Laravel](https://github.com/laravel/laravel) project.
1718

1819
This tutorial assumes you have installed TortoiseGit for Windows and you have created a GitHub account. If you haven't already, look at the [Laravel on GitHub](/docs/contrib/github) documentation in order to familiarize yourself with Laravel's repositories and branches.
1920

20-
<a name='forking-laravel'></a>
21+
<a name="forking-laravel"></a>
2122
## Forking Laravel
2223

2324
Login to GitHub and visit the [Laravel Repository](https://github.com/laravel/laravel). Click on the **Fork** button. This will create your own fork of Laravel in your own GitHub account. Your Laravel fork will be located at **https://github.com/username/laravel** (your GitHub username will be used in place of *username*).
2425

25-
<a name='cloning-laravel'></a>
26+
<a name="cloning-laravel"></a>
2627
## Cloning Laravel
2728

2829
Open up Windows Explorer and create a new directory where you can make development changes to Laravel.
2930

30-
- Right-click the Laravel directory to bring up the context menu. Click on **Git Clone...**
31-
- Git clone
31+
- Right-click the Laravel directory to bring up the context menu. Click on **Git Clone...**
32+
- Git clone
3233
- **Url:** https://github.com/laravel/laravel.git
3334
- **Directory:** the directory that you just created in the previous step
3435
- Click **OK**
3536

3637
> **Note**: The reason you are cloning the original Laravel repository (and not the fork you made) is so you can always pull down the most recent changes from the Laravel repository to your local repository.
3738
38-
<a name='adding-your-fork'></a>
39+
<a name="adding-your-fork"></a>
3940
## Adding your Fork
4041

4142
After the cloning process is complete, it's time to add the fork you made as a **remote repository**.
4243

43-
- Right-click the Laravel directory and goto **TortoiseGit > Settings**
44-
- Goto the **Git/Remote** section. Add a new remote:
44+
- Right-click the Laravel directory and goto **TortoiseGit > Settings**
45+
- Goto the **Git/Remote** section. Add a new remote:
4546
- **Remote**: fork
4647
- **URL**: https://github.com/username/laravel.git
4748
- Click **Add New/Save**
4849
- Click **OK**
4950

5051
Remember to replace *username* with your GitHub username. *This is case-sensitive*.
5152

52-
<a name='creating-branches'></a>
53+
<a name="creating-branches"></a>
5354
## Creating Branches
5455

5556
Now you are ready to create a new branch for your new feature or bug-fix. When you create a new branch, use a self-descriptive naming convention. For example, if you are going to fix a bug in Eloquent, name your branch *bug/eloquent*. Or if you were going to make changes to the localization documentation, name your branch *feature/localization-docs*. A good naming convention will encourage organization and help others understand the purpose of your branch.
5657

57-
- Right-click the Laravel directory and goto **TortoiseGit > Create Branch**
58+
- Right-click the Laravel directory and goto **TortoiseGit > Create Branch**
5859
- **Branch:** feature/localization-docs
5960
- **Base On Branch:** remotes/origin/develop
6061
- **Check** *Track*
@@ -67,47 +68,47 @@ This will create your new *feature/localization-docs* branch and switch you to i
6768
6869
Now that you have created your own branch and have switched to it, it's time to make your changes to the code. Add your new feature or fix that bug.
6970

70-
<a name='committing'></a>
71+
<a name="committing"></a>
7172
##Committing
7273

7374
Now that you have finished coding and testing your changes, it's time to commit them to your local repository:
7475

75-
- Right-click the Laravel directory and goto **Git Commit -> "feature/localization-docs"...**
76-
- Commit
76+
- Right-click the Laravel directory and goto **Git Commit -> "feature/localization-docs"...**
77+
- Commit
7778
- **Message:** Provide a brief explaination of what you added or changed
7879
- Click **Sign** - This tells the Laravel team know that you personally agree to your code being added to the Laravel core
7980
- **Changes made:** Check all changed/added files
8081
- Click **OK**
8182

82-
<a name='pushing-to-your-fork'></a>
83+
<a name="pushing-to-your-fork"></a>
8384
## Pushing to your Fork
8485

8586
Now that your local repository has your committed changes, it's time to push (or sync) your new branch to your fork that is hosted in GitHub:
8687

8788
- Right-click the Laravel directory and goto **Git Sync...**
8889
- Git Syncronization
89-
- **Local Branch:** feature/localization-docs
90-
- **Remote Branch:** leave this blank
91-
- **Remote URL:** fork
92-
- Click **Push**
93-
- When asked for "username:" enter your GitHub *case-sensitive* username
94-
- When asked for "password:" enter your GitHub *case-sensitive* account
90+
- **Local Branch:** feature/localization-docs
91+
- **Remote Branch:** leave this blank
92+
- **Remote URL:** fork
93+
- Click **Push**
94+
- When asked for "username:" enter your GitHub *case-sensitive* username
95+
- When asked for "password:" enter your GitHub *case-sensitive* account
9596

9697
Your branch has been successfully pushed to your fork on GitHub.
9798

98-
<a name='submitting-a-pull-request'></a>
99+
<a name="submitting-a-pull-request"></a>
99100
## Submitting a Pull Request
100101

101102
The final step is to submit a pull request to the Laravel repository. This means that you are requesting that the Laravel team pull and merge your changes to the Laravel core. In your browser, visit your Laravel fork at [https://github.com/username/laravel](https://github.com/username/laravel). Click on **Pull Request**. Next, make sure you choose the proper base and head repositories and branches:
102103

103-
- **base repo:** laravel/laravel
104-
- **base branch:** develop
105-
- **head repo:** username/laravel
106-
- **head branch:** feature/localization-docs
104+
- **base repo:** laravel/laravel
105+
- **base branch:** develop
106+
- **head repo:** username/laravel
107+
- **head branch:** feature/localization-docs
107108

108109
Use the form to write a more detailed description of the changes you made and why you made them. Finally, click **Send pull request**. That's it! The changes you made have been submitted to the Laravel team.
109110

110-
<a name='whats-next'></a>
111+
<a name="whats-next"></a>
111112
## What's Next?
112113

113114
Do you have another feature you want to add or another bug you need to fix? Just follow the same instructions as before in the [Creating Branches](#creating-branches) section. Just remember to always create a new branch for every new feature/fix and don't forget to always base your new branches off of the *remotes/origin/develop* branch.

0 commit comments

Comments
 (0)
0