I've tried to cover all git basics.
These are the commands that you use 80% of the time. Learn and practice makes this perfect. Hone your git skills with them.
Also in this video:
Solving a merge conflict (13:30)
Chapters:
0:00 Intro
0:39 git init
0:52 git log
1:23 git status
1:47 git add
2:07 git commit
2:43 git remote
3:02 git push
3:44 git branch
4:15 git checkout
7:28 git reset
12:00 git merge
13:00 git pull
13:30 raising a conflict
15:07 git fetch
15:24 git branch -a
17:20 Outro