BigW Consortium Gitlab

start-using-git.md 3.72 KB
Newer Older
1
# Start using Git on the command line
karen Carias committed
2

3
If you want to start using Git and GitLab, make sure that you have created and/or signed into an account on GitLab.
karen Carias committed
4 5 6

## Open a shell

7
Depending on your operating system, you will need to use a shell of your preference. Here are some suggestions:
karen Carias committed
8 9 10 11 12 13 14 15 16

- [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

17
Git is usually preinstalled on Mac and Linux.
karen Carias committed
18

19
Type the following command and then press enter:
karen Carias committed
20 21 22 23
```
git --version
```

24
You should receive a message that will tell you which Git version you have on 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).
karen Carias committed
25

26
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.
karen Carias committed
27

28
After you are finished installing, open a new shell and type "git --version" again to verify that it was correctly installed.
karen Carias committed
29 30 31

## Add your Git username and set your email

32
It is important to configure your Git username and email address as every Git commit will use this information to identify you as the author.
karen Carias committed
33

34
On your shell, type the following command to add your username:
karen Carias committed
35
```
36
git config --global user.name "YOUR_USERNAME"
karen Carias committed
37 38
```

39
Then verify that you have the correct username:
40
```
karen Carias committed
41 42 43
git config --global user.name
```

44
To set your email address, type the following command:
karen Carias committed
45
```
46
git config --global user.email "your_email_address@example.com"
karen Carias committed
47 48
```

49
To verify that you entered your email correctly, type:
50
```
karen Carias committed
51 52 53
git config --global user.email
```

54
You'll need to do this only once as 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.
karen Carias committed
55 56 57

## Check your information

58
To view the information that you entered, type:
59
```
karen Carias committed
60 61
git config --global --list
```
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77
## 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
78
Spaces won't be recognized, so you will need to use a hyphen or underscore.
79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121
```
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
```
122 123 124 125 126 127 128

### Merge master branch with created branch
You need to be in the master branch.
```
git checkout master
git merge NAME-OF-BRANCH
```