* 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
### 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
* 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, sign in to [GitLab.com](https://gitlab.com)
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, sign in to [GitLab.com](https://gitlab.com).
* 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
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.
* 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)
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).
## On the command line
* To clone your project, go to your computer's shell and type the following command
### 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
A clone of the project will be created in your computer.
* Go into a project, directory or file to work in it
### Go into a project, directory or file to work in it
```
cd NAME-OF-PROJECT-OR-FILE
```
* Go back one directory or file
### Go back one directory or file
```
cd ../
```
* To see what’s in the directory that you are in
### View what’s in the directory that you are in
```
ls
```
* Create a directory
### Create a directory
```
mkdir NAME-OF-YOUR-DIRECTORY
```
* Create a README.md or file in directory
### Create a README.md or file in directory
```
touch README.md
nano README.md
...
...
@@ -51,22 +52,23 @@ nano README.md
#### Press: enter
```
* Remove a file
### Remove a file
```
rm NAME-OF-FILE
```
* Remove a directory and all of its contents
### Remove a directory and all of its contents
```
rm -rf NAME-OF-DIRECTORY
```
* View history in the command line
### 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)
### Carry out commands for which the account you are using lacks authority
You will be asked for an administrator’s password.
If you want to start using a Git and GitLab, make sure that you have created an account on [GitLab.com](https://about.gitlab.com/)
If you want to start using a Git and GitLab, make sure that you have created an account on [GitLab.com](https://about.gitlab.com/).
## Open a shell
* Depending on your operating system, find the shell of your preference. Here are some suggestions
Depending on your operating system, find the shell of your preference. Here are some suggestions.
-[Terminal](http://blog.teamtreehouse.com/introduction-to-the-mac-os-x-command-line) on Mac OSX
...
...
@@ -14,54 +14,48 @@ If you want to start using a Git and GitLab, make sure that you have created an
## Check if Git has already been installed
* Git is usually preinstalled on Mac and Linux
* Type the following command and then press enter
Git is usually preinstalled on Mac and Linux.
Type the following command and then press enter:
```
git --version
```
* You should receive a message that will tell you which Git version you have in your computer. If you don’t receive a "Git version" message, it means that you need to [download Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
You should receive a message that will tell you which Git version you have in your computer. If you don’t receive a "Git version" message, it means that you need to [download Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
* If Git doesn't automatically download, there's an option on the website to [download manually](https://git-scm.com/downloads). Then follow the steps on the installation window
If Git doesn't automatically download, there's an option on the website to [download manually](https://git-scm.com/downloads). Then follow the steps on the installation window.
* After you finished installing, open a new shell and type "git --version" again to verify that it was correctly installed
After you finished installing, open a new shell and type "git --version" again to verify that it was correctly installed.
## Add your Git username and set your email
* It is important because every Git commit that you create will use this information
* On your shell, type the following command to add your username
It is important because every Git commit that you create will use this information.
On your shell, type the following command to add your username:
```
git config --global user.name ADD YOUR USERNAME
```
* Then verify that you have the correct username
Then verify that you have the correct username:
```
git config --global user.name
```
* To set your email address, type the following command
To set your email address, type the following command:
```
git config --global user.email ADD YOUR EMAIL
```
* To verify that you entered your email correctly, type
To verify that you entered your email correctly, type:
```
git config --global user.email
```
* You'll need to do this only once because you are using the "--global" option. It tells Git to always use this information for anything you do on that system. If you want to override this with a different username or email address for specific projects, you can run the command without the "--global" option when you’re in that project
You'll need to do this only once because you are using the "--global" option. It tells Git to always use this information for anything you do on that system. If you want to override this with a different username or email address for specific projects, you can run the command without the "--global" option when you’re in that project.
