gitlab-org--gitlab-foss/doc/gitlab-basics/start-using-git.md

131 lines
3.6 KiB
Markdown
Raw Normal View History

# Start using Git on the command line
2015-06-17 16:44:48 +00:00
If you want to start using a Git and GitLab, make sure that you have created an
account on GitLab.
2015-06-17 16:44:48 +00:00
## Open a shell
Depending on your operating system, find the shell of your preference. Here are some suggestions.
2015-06-17 16:44:48 +00:00
- [Terminal](http://blog.teamtreehouse.com/introduction-to-the-mac-os-x-command-line) on Mac OSX
- [GitBash](https://msysgit.github.io) on Windows
- [Linux Terminal](http://www.howtogeek.com/140679/beginner-geek-how-to-start-using-the-linux-terminal/) on Linux
## Check if Git has already been installed
Git is usually preinstalled on Mac and Linux.
2015-06-17 16:44:48 +00:00
Type the following command and then press enter:
2015-06-17 16:44:48 +00:00
```
git --version
```
You should receive a message that will tell you which Git version you have in your computer. If you dont receive a "Git version" message, it means that you need to [download Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
2015-06-17 16:44:48 +00:00
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.
2015-06-17 16:44:48 +00:00
After you finished installing, open a new shell and type "git --version" again to verify that it was correctly installed.
2015-06-17 16:44:48 +00:00
## Add your Git username and set your email
It is important because every Git commit that you create will use this information.
2015-06-17 16:44:48 +00:00
On your shell, type the following command to add your username:
2015-06-17 16:44:48 +00:00
```
git config --global user.name ADD YOUR USERNAME
```
Then verify that you have the correct username:
2015-06-30 15:57:17 +00:00
```
2015-06-17 16:44:48 +00:00
git config --global user.name
```
To set your email address, type the following command:
2015-06-17 16:44:48 +00:00
```
git config --global user.email ADD YOUR EMAIL
```
To verify that you entered your email correctly, type:
2015-06-30 15:57:17 +00:00
```
2015-06-17 16:44:48 +00:00
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 youre in that project.
2015-06-17 16:44:48 +00:00
## Check your information
To view the information that you entered, type:
2015-06-30 15:57:17 +00:00
```
2015-06-17 16:44:48 +00:00
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
```
2016-07-21 16:49:40 +00:00
### Merge master branch with created branch
You need to be in the master branch.
```
git checkout master
git merge NAME-OF-BRANCH
```