Commit d0898fa2 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'gitlab_intro_docs' into 'master'

GitLab intro docs

Related to https://gitlab.com/gitlab-org/marketing_monthly_release/issues/1

---

Need refactor:

- Create a new project
- Create a new group
- Create a new issue
- Assign labels to issues
- Use milestones as an overview of your project's tracker
- Fork a project and contribute to it
- Create a new merge request
- Automatically close issues from merge requests (include GitLab.com pattern)
- GitLab CI quick start guide (make it easier to follow)

Moved to https://gitlab.com/gitlab-org/gitlab-ce/issues/8068

See merge request !3225
parents fc6ee359 09cd4351
...@@ -2,26 +2,14 @@ ...@@ -2,26 +2,14 @@
Step-by-step guides on the basics of working with Git and GitLab. Step-by-step guides on the basics of working with Git and GitLab.
* [Start using Git on the command line](start-using-git.md) - [Start using Git on the command line](start-using-git.md)
- [Create and add your SSH Keys](create-your-ssh-keys.md)
* [Create and add your SSH Keys](create-your-ssh-keys.md) - [Command Line basics](command-line-commands.md)
- [Create a project](create-project.md)
* [Command Line basic commands](command-line-commands.md) - [Create a group](create-group.md)
- [Create a branch](create-branch.md)
* [Basic Git commands](basic-git-commands.md) - [Fork a project](fork-project.md)
- [Add a file](add-file.md)
* [Create a project](create-project.md) - [Add an image](add-image.md)
- [Create a Merge Request](add-merge-request.md)
* [Create a group](create-group.md) - [Create an Issue](create-issue.md)
* [Create a branch](create-branch.md)
* [Fork a project](fork-project.md)
* [Add a file](add-file.md)
* [Add an image](add-image.md)
* [Create a Merge Request](add-merge-request.md)
* [Create an Issue](create-issue.md)
# Basic Git commands # Basic Git commands
### Go to the master branch to pull the latest changes from there This section is now merged into [Start using Git](start-using-git.md).
```
git checkout master
```
### Download the latest changes in the project
This is for you to work on an up-to-date copy (it is important to do every time you work on a project), while you setup tracking branches.
```
git pull REMOTE NAME-OF-BRANCH -u
```
(REMOTE: origin) (NAME-OF-BRANCH: could be "master" or an existing branch)
### Create a branch
Spaces won't be recognized, so you need to use a hyphen or underscore.
```
git checkout -b NAME-OF-BRANCH
```
### Work on a branch that has already been created
```
git checkout NAME-OF-BRANCH
```
### View the changes you've made
It's important to be aware of what's happening and what's the status of your changes.
```
git status
```
### Add changes to commit
You'll see your changes in red when you type "git status".
```
git add CHANGES IN RED
git commit -m "DESCRIBE THE INTENTION OF THE COMMIT"
```
### Send changes to gitlab.com
```
git push REMOTE NAME-OF-BRANCH
```
### Delete all changes in the Git repository, but leave unstaged things
```
git checkout .
```
### Delete all changes in the Git repository, including untracked files
```
git clean -f
```
### Merge created branch with master branch
You need to be in the created branch.
```
git checkout NAME-OF-BRANCH
git merge master
```
# Start using Git on the command line # Start using Git on the command line
If you want to start using a Git and GitLab, make sure that you have created an account on GitLab. If you want to start using a Git and GitLab, make sure that you have created an
account on GitLab.
## Open a shell ## Open a shell
...@@ -59,3 +60,63 @@ To view the information that you entered, type: ...@@ -59,3 +60,63 @@ To view the information that you entered, type:
``` ```
git config --global --list git config --global --list
``` ```
## Basic Git commands
### Go to the master branch to pull the latest changes from there
```
git checkout master
```
### Download the latest changes in the project
This is for you to work on an up-to-date copy (it is important to do every time you work on a project), while you setup tracking branches.
```
git pull REMOTE NAME-OF-BRANCH -u
```
(REMOTE: origin) (NAME-OF-BRANCH: could be "master" or an existing branch)
### Create a branch
Spaces won't be recognized, so you need to use a hyphen or underscore.
```
git checkout -b NAME-OF-BRANCH
```
### Work on a branch that has already been created
```
git checkout NAME-OF-BRANCH
```
### View the changes you've made
It's important to be aware of what's happening and what's the status of your changes.
```
git status
```
### Add changes to commit
You'll see your changes in red when you type "git status".
```
git add CHANGES IN RED
git commit -m "DESCRIBE THE INTENTION OF THE COMMIT"
```
### Send changes to gitlab.com
```
git push REMOTE NAME-OF-BRANCH
```
### Delete all changes in the Git repository, but leave unstaged things
```
git checkout .
```
### Delete all changes in the Git repository, including untracked files
```
git clean -f
```
### Merge created branch with master branch
You need to be in the created branch.
```
git checkout NAME-OF-BRANCH
git merge master
```
# Get started with GitLab
## Organize
Create projects and groups.
- [Create a new project](../gitlab-basics/create-project.md)
- [Create a new group](../gitlab-basics/create-group.md)
## Prioritize
Create issues, labels, milestones, cast your vote, and review issues.
- [Create a new issue](../gitlab-basics/create-issue.md)
- [Assign labels to issues](../workflow/labels.md)
- [Use milestones as an overview of your project's tracker](../workflow/milestones.md)
- [Use voting to express your like/dislike to issues and merge requests](../workflow/award_emoji.md)
## Collaborate
Create merge requests and review code.
- [Fork a project and contribute to it](../workflow/forking_workflow.md)
- [Create a new merge request](../gitlab-basics/add-merge-request.md)
- [Automatically close issues from merge requests](../customization/issue_closing.md)
- [Automatically merge when your builds succeed](../workflow/merge_when_build_succeeds.md)
- [Revert any commit](../workflow/revert_changes.md)
## Test and Deploy
Use the built-in continuous integration in GitLab.
- [Get started with GitLab CI](../ci/quick_start/README.md)
## Install and Update
Install and update your GitLab installation.
- [Install GitLab](https://about.gitlab.com/installation/)
- [Update GitLab](https://about.gitlab.com/update/)
- [Explore Omnibus GitLab configuration options](http://doc.gitlab.com/omnibus/settings/configuration.html)
# Award emojis
>**Note:**
This feature was [introduced][1825] in GitLab 8.2.
When you're collaborating online, you get fewer opportunities for high-fives
and thumbs-ups. In order to make virtual celebrations easier, you can now vote
on issues and merge requests using emoji!
![Award emoji](img/award_emoji_select.png)
This makes it much easier to give and receive feedback, without a long comment
thread. Any comment that contains only the thumbs up or down emojis is
converted to a vote and depicted in the emoji area.
You can then use that functionality to sort issues and merge requests based on
popularity.
## Sort issues and merge requests on vote count
>**Note:**
This feature was [introduced][2871] in GitLab 8.5.
You can quickly sort the issues or merge requests by the number of votes they
have received. The sort option can be found in the right dropdown menu.
![Votes sort options](img/award_emoji_votes_sort_options.png)
---
Sort by most popular issues/merge requests.
![Votes sort by most popular](img/award_emoji_votes_most_popular.png)
---
Sort by least popular issues/merge requests.
![Votes sort by least popular](img/award_emoji_votes_least_popular.png)
---
The number of upvotes and downvotes is not summed up. That means that an issue
with 18 upvotes and 5 downvotes is considered more popular than an issue with
17 upvotes and no downvotes.
[2871]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2781
[1825]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1825
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment