Table of Contents

• Table of Contents
• How to Git started
  • Using a GUI
  • Learning objectives
  • Assignments
    • Assignment 1: Create a repository
    • Assignment 2: Your first commit
    • Assignment 3: Merge conflicts
    • Assignment 5: Branching
    • Assignment 6: Merge branches (Or Rebase)
    • Assignment 7: Pull requests
    • Assignment 8: Undo / Revert commit
    • Assignment 9:
  • Using the terminal
    • Getting started
    • Terminal commands

How to Git started

Using a GUI

You can use any GUI for git, the ones we use are Fork and Sourcetree
You can download these at https://www.sourcetreeapp.com/ and https://git-fork.com/

For other GUIs check out https://git-scm.com/downloads/guis/

Our remote git server is located at https://git.web.rug.nl/
You can log in with your usual p-number and password.

Cheatsheets: Markdown

Learning objectives

• Introduction to VCS
• Create new repository
• README.md
• Git ignore file
• Staging
• Committing
• Git push
• Git pull request
• Branching
• Merge / Rebase
• Undoing Things
  • Amend commits
  • Unstaging
  • Unmodifying a modified file
  • Revert and reset
• Tag
• Log

Assignments

Assignment 1: Create a repository

1. Create your own new repository
2. Add a .gitignore file
3. Why you would like a gitignore file
   • Not pushing sensitive files
   • Not pushing environment files
4. Add a README.md

Assignment 2: Your first commit

0. Clone repository
1. Edit README file
2. Create a new file(s) and add information
3. Stage README and your file(s)
4. Commit README and your file(s)

Assignment 3: Merge conflicts

0. Go to the How to Git started repository
1. Add icecream.py to your repository
2. Choose a partner
3. Add him/her as a collaborator
4. Make the partner clone your repository
5. Let both of you edit the same line in the code file
6. Let one of you stage and push the changes
7. Solve the merge conflict

Assignment 5: Branching

0. Go to the How to Git started repository
1. Add index.html to your shared repository.
2. Let person A create a new branch called header
3. Let person B create a new branch called footer
4. Let person A edit the header of index.html
5. Let person B edit the footer of index.html
6. Stage and push the changes
7. Pull the latest changes
8. Track the branch of your partner

Assignment 6: Merge branches (Or Rebase)

0. Go to your master branch
1. Merge it with the header branch
2. Commit the merge
3. Merge it with the footer branch
4. Commit the merge
5. Push the changes
6. Delete your old branches

Assignment 7: Pull requests

0. Let one of you create a new repository (do not add collaborators)
1. Stage and commit a file
2. Let the other person fork the repository and clone it
3. Let him/her change the file and push it
4. Let him/her create a new pull request via the GUI
5. Let the other approve and merge the request
6. Let the other pull the latest changes

Assignment 8: Undo / Revert commit

Assignment 9:

Check the logs

Using the terminal

Getting started

Set up your git info

*** Please tell me who you are.

Run

  git config --global user.email "you@example.com"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

If you want to save your https credentials run

git config --global credential.helper store
Omit --global to set the identity only in this repository.

Or you can add an SSH key

Terminal commands

See changes that have been made

git diff

Adding files to commit

git add file1 file2
git add *

Committing files with commit message

git commit -m "your commit message"

unstage by using

use "git reset HEAD <file>..." to unstage

Creating a new branch

git branch <branchname>
git checkout -b <branchname>

Going to different branch

git checkout <branchname>

Seeing available branches

git branch -a

Track remote branch

git checkout --track origin/<branch>

Delete remote branch

git push <remote_name> --delete <branch_name>
git remote prune <remote_name>

Check the log in graph form

git log --graph --oneline