summaryrefslogtreecommitdiff
path: root/doc/gitlab-basics/basic-git-commands.md
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-07-27 11:22:35 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-07-27 11:22:35 +0200
commit0be6debb0b3350f35bf4b6a904c60da826314b3b (patch)
tree5a9281db4a97d8ffa8f3efc73e17fb0b11b17aef /doc/gitlab-basics/basic-git-commands.md
parentd371331a65070ce5b3ab9c210eac697062170c91 (diff)
parentcd6046e1dd347f3a9bd7d062447aa25306a5755b (diff)
downloadgitlab-ce-0be6debb0b3350f35bf4b6a904c60da826314b3b.tar.gz
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions
Diffstat (limited to 'doc/gitlab-basics/basic-git-commands.md')
-rw-r--r--doc/gitlab-basics/basic-git-commands.md32
1 files changed, 16 insertions, 16 deletions
diff --git a/doc/gitlab-basics/basic-git-commands.md b/doc/gitlab-basics/basic-git-commands.md
index ed210ba5420..2b5767dd2d3 100644
--- a/doc/gitlab-basics/basic-git-commands.md
+++ b/doc/gitlab-basics/basic-git-commands.md
@@ -1,58 +1,58 @@
# Basic Git commands
-* Go to the master branch to pull the latest changes from there
+### Go to the master branch to pull the latest changes from there
```
git checkout master
```
-* Download the latest changes in the project, so that you work on an up-to-date copy (this is important to do every time you work on a project), while you setup tracking branches
+### 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 (remember that spaces won't be recognized, you need to use a hyphen or underscore)
+### 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
+### Work on a branch that has already been created
```
git checkout NAME-OF-BRANCH
```
-* To see the changes you've made (it's important to be aware of what's happening and what's the status of your changes)
+### 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 be able to see your changes in red when you type "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
+### Send changes to gitlab.com
```
-git push origin NAME-OF-BRANCH
+git push REMOTE NAME-OF-BRANCH
```
-* Throw away all changes in the Git repository, but leave unstaged things
+### Delete all changes in the Git repository, but leave unstaged things
```
git checkout .
```
-* Delete all changes in the Git repository, including untracked files
+### Delete all changes in the Git repository, including untracked files
```
git clean -f
```
-* Remove all the changes that you don't want to send to gitlab.com
-```
-git add NAME-OF-FILE -all
-```
-
-* Merge created branch with master branch. You need to be in the created branch
+### Merge created branch with master branch
+You need to be in the created branch.
```
git checkout NAME-OF-BRANCH
git merge master