Merge branch 'commandline' into 'master'

doc/gitlab-basics/README.md

+# GitLab basics
+
+Step-by-step guides on the basics of working with Git and GitLab.
+
+* [Start using Git on the commandline](start-using-git.md)
+
+* [Create and add your SSH Keys](create-your-ssh-keys.md)
+
+* [Command Line basic commands](command-line-commands.md)
+
+* [Basic Git commands](basic-git-commands.md)

doc/gitlab-basics/basic-git-commands.md

+# 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, 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
+```
+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)
+```
+git checkout -b NAME-OF-BRANCH
+```
+
+* 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)
+```
+git status
+```
+
+* Add changes to commit (you'll be able to 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 origin NAME-OF-BRANCH
+```
+
+* Throw away 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
+```
+
+* 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
+```
+git checkout NAME-OF-BRANCH
+git merge master
+```

doc/gitlab-basics/command-line-commands.md

+# Command Line basic commands
+
+## Start working on your project
+
+* In Git, when you copy a project you say you "clone" it. To work on a git project locally (from your own computer), you will need to clone it. To do this, start by signing in at GitLab.com.. To do it, go to your [gitlab.com](https://gitlab.com) account
+
+* When you are on your Dashboard, click on the project that you'd like to clone, which you'll find at the right side of your screen
+
+![Select a project](basicsimages/select_project.png)
+
+* To work in the project, you can copy a link to the Git repository through a SSH or a HTTPS protocol. SSH is easier to use after it's been [setup](create-your-ssh-keys.md). When you're in the project, click on the HTTPS or SSH button at the right side of your screen. Then copy the link (you'll have to paste it on your shell in the next step)
+
+![Copy the HTTPS or SSH](basicsimages/https.png)
+
+## On the command line
+
+* To clone your project, go to your computer's shell and type the following command
+```
+git clone PASTE HTTPS OR SSH HERE
+```
+
+* A clone of the project will be created in your computer
+
+* Go into a project, directory or file to work in it
+```
+cd NAME-OF-PROJECT-OR-FILE
+```
+
+* Go back one directory or file
+```
+cd ../
+```
+
+* To see what’s in the directory that you are in
+```
+ls
+```
+
+* Create a directory
+```
+mkdir NAME-OF-YOUR-DIRECTORY
+```
+
+* Create a README.md or file in directory
+```
+touch README.md
+nano README.md
+#### ADD YOUR INFORMATION
+#### Press: control + X
+#### Type: Y
+#### Press: enter
+```
+
+* Remove a file
+```
+rm NAME-OF-FILE
+```
+
+* Remove a directory and all of its contents
+```
+rm -rf NAME-OF-DIRECTORY
+```
+
+* View history in the command line
+```
+history
+```
+
+* Carry out commands for which the account you are using lacks authority. (You will be asked for an administrator’s password)
+```
+sudo
+```

doc/gitlab_basics/create_your_ssh_keys.md → doc/gitlab-basics/create-your-ssh-keys.md

@@ -28,7 +28,7 @@ You need to connect your computer to your GitLab account through SSH Keys. They
 
 ## To generate an SSH Key on your commandline
 
-* Go to your [commandline](start_using_git.md) and follow the [instructions](https://gitlab.com/help/ssh/README) to generate it 
+* Go to your [commandline](start-using-git.md) and follow the [instructions](https://gitlab.com/help/ssh/README) to generate it 
 
 * Copy the SSH Key that your commandline created and paste it on the "Key" box on the GitLab page. The title will be added automatically
 

doc/gitlab_basics/start_using_git.md → doc/gitlab-basics/start-using-git.md

@@ -40,7 +40,7 @@ git config --global user.name ADD YOUR USERNAME
 
 * Then verify that you have the correct username
 
-```	
+```
 git config --global user.name
 ```
 
@@ -52,7 +52,7 @@ git config --global user.email ADD YOUR EMAIL
 
 * To verify that you entered your email correctly, type
 
-```		
+```
 git config --global user.email
 ```
 
@@ -62,6 +62,6 @@ git config --global user.email
 
 * To view the information that you entered, type
 
-```		
+```
 git config --global --list
 ```

doc/gitlab_basics/README.md

-# GitLab basics
-
-Step-by-step guides on the basics of working with Git and GitLab.
-
-* [Start using Git on the commandline](start_using_git.md)
-
-* [Create and add your SSH Keys](create_your_ssh_keys.md)