kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:gitlabhq/gitlabhq

This commit is contained in:
Dmitriy Zaporozhets 2014-04-01 12:28:21 +03:00
parent 1069ffb873 a9af2e5d83
commit 9be05a430b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/README.md
View File

@ -3,7 +3,7 @@
+ [API](api/README.md) + [API](api/README.md)
+ [Development](development/README.md) + [Development](development/README.md)
+ [Install](install/README.md) + [Install](install/README.md)
+ [Integration](external-issue-tracker/README.md) + [Integration](integration/external-issue-tracker.md)
+ [Legal](legal/README.md) + [Legal](legal/README.md)
+ [Markdown](markdown/markdown.md) + [Markdown](markdown/markdown.md)
+ [Permissions](permissions/permissions.md) + [Permissions](permissions/permissions.md)

7
doc/workflow/workflow.md
View File

@ -3,24 +3,25 @@
```bash ```bash
git clone git@example.com:project-name.git git clone git@example.com:project-name.git
``` ```
2. Create branch with your feature 2. Create branch with your feature
```bash ```bash
git checkout -b $feature_name git checkout -b $feature_name
``` ```
3. Write code. Comit changes 3. Write code. Commit changes
```bash ```bash
git commit -am "My feature is ready" git commit -am "My feature is ready"
``` ```
4. Push your branch to GitLab 4. Push your branch to GitLab
```bash ```bash
git push origin $feature_name git push origin $feature_name
``` ```
5. Review your code on Commits page 5. Review your code on commits page
6. Create a merge request 6. Create a merge request
7. Your team lead will review the code & merge it to the main branch 7. Your team lead will review the code & merge it to the main branch