summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaren Carias <karen@gitlab.com>2015-06-30 12:45:21 -0700
committerkaren Carias <karen@gitlab.com>2015-06-30 12:45:21 -0700
commit7b7dd96b7d34b67a35338ef67ebc16840183cdc4 (patch)
treed8420ab9fe673fe90aed777e849aceee72802477
parentaf93e043da1f6568dd95ffcea801947c9786072a (diff)
downloadgitlab-ce-7b7dd96b7d34b67a35338ef67ebc16840183cdc4.tar.gz
organized commands
-rw-r--r--doc/gitlab-basics/basic-git-commands.md52
-rw-r--r--doc/gitlab-basics/command-line-commands.md57
2 files changed, 54 insertions, 55 deletions
diff --git a/doc/gitlab-basics/basic-git-commands.md b/doc/gitlab-basics/basic-git-commands.md
index 895876c41d9..ed210ba5420 100644
--- a/doc/gitlab-basics/basic-git-commands.md
+++ b/doc/gitlab-basics/basic-git-commands.md
@@ -1,17 +1,5 @@
# Basic Git commands
-It's important to know some basic commands to work on your shell
-
-* Go into a project, directory or file to work in it
-```
-cd NAME-OF-PROJECT-OR-FILE
-```
-
-* Go back one directory or file
-```
-cd ../
-```
-
* Go to the master branch to pull the latest changes from there
```
git checkout master
@@ -33,26 +21,6 @@ git checkout -b NAME-OF-BRANCH
git checkout NAME-OF-BRANCH
```
-* 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
-```
-
* 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
@@ -69,16 +37,6 @@ git commit -m "DESCRIBE THE INTENTION OF THE COMMIT"
git push origin NAME-OF-BRANCH
```
-* Remove a file
-```
-rm NAME-OF-FILE
-```
-
-* Remove a directory and all of its contents
-```
-rm -rf NAME-OF-DIRECTORY
-```
-
* Throw away all changes in the Git repository, but leave unstaged things
```
git checkout .
@@ -89,11 +47,6 @@ git checkout .
git clean -f
```
-* View history in terminal
-```
-history
-```
-
* Remove all the changes that you don't want to send to gitlab.com
```
git add NAME-OF-FILE -all
@@ -104,8 +57,3 @@ git add NAME-OF-FILE -all
git checkout NAME-OF-BRANCH
git merge master
```
-
-* Carry out commands for which the account you are using lacks authority. (You will be asked for an administrator’s password)
-```
-sudo
-```
diff --git a/doc/gitlab-basics/command-line-commands.md b/doc/gitlab-basics/command-line-commands.md
index 3edd6760c69..27d84319092 100644
--- a/doc/gitlab-basics/command-line-commands.md
+++ b/doc/gitlab-basics/command-line-commands.md
@@ -10,14 +10,65 @@
* 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](basicsimages/https.png)
+![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
+
+It's important to know some basic commands to work on your shell
+
+* Go into a project, directory or file to work in it
+```
+cd NAME-OF-PROJECT-OR-FILE
+```
+* Go back one directory or file
```
-git clone PASTE HTTPS HERE
+cd ../
```
-* A clone of the project will be created in your computer
+* 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
+```