Slides from workshop about git basics

1. Git & Github
workshop

2. Agenda
Git basics
- File status lifecycle
- Staging and committing
- Undoing things
Distributed Git & Github I
- Basic workflow (fork, commit, pull request)
Branching
- Creating and switching branches
- Merging
- Rebasing
Distributed Git & Github II
- Distributed workflow
- Synchronising with upstream
and resolving conflicts

3. Git basics
$ git init

4. Git basics - file status lifecycle
$ git status
untracked unmodified modified staged
add the file
edit the file
stage the file
remove the file
commit

5. Git basics - staging and committing
Stage file and track untracked files
$ git add <file name | wildcard>
Remove and stage file removal
$ git rm <file name | wildcard>
Commit staged changes
$ git commit -m “<message>”

6. Git basics - staging and commiting
$ cat .gitignore
tmp/ # ignore all files in tmp dir
logs/*.log # all files in logs dir with .log
*.tmp # all files with .tmp ext

7. Git basics - staging and commiting
Show unstaged changes
$ git diff
Show staged changes
$ git diff --cached

8. Git basics - staging and commiting
Show all commits with authors, dates and
descriptions
$ git log
Show all commits with complete diff
$ git log -p
Show all commits with additions/deletions
stats
$ git log --stat

9. Git basics - undoing things
Change last commit
$ git commit --amend
Unstage changes in given file
$ git reset HEAD <file name>
Revert unstaged changes in given file
$ git checkout -- <file name>

10. Git basics - distributed Git & Github I
blessed repository

11. Git basics - distributed Git & Github I
blessed repository
developer
public
developer
public
developer
public
fork
fork
fork

12. Git basics - distributed Git & Github I
blessed repository
developer
public
developer
public
developer
public
developer
private
developer
private
developer
private
clone clone clone
commit

13. Git basics - distributed Git & Github I
blessed repository
developer
public
developer
public
developer
public
developer
private
developer
private
developer
private
push

14. Git basics - distributed Git & Github I
blessed repository
developer
public
developer
public
developer
public
developer
private
developer
private
developer
private
pull request

15. Git basics - distributed Git & Github I
blessed repository
developer
public
developer
public
developer
public
developer
private
developer
private
developer
private
review pull request & merge

16. Git basics - distributed Git & Github I
$ git clone <url>
$ git push <remote> <branch>

17. Git basics - Creating and switching
branches
Create branch
$ git branch <name>
Activate branch
$ git checkout <name>
Remove branch
$ git branch -d <name>

18. Git basics - Creating and switching
branches
Merge changes from branch <branch> to
selected branch
$ git merge <branch>
c0
b1 c1
c2b2
c3
branch
commit
merge

19. Git basics - Creating and switching
branches
Rebase changes from branch <branch> to given
branch
$ git rebase <branch>
c0
b1 c1
c2b2
branch
commit
c0
b1 c1
c2
b2
branch
commit
c1
c2
rebase