Git examples:
Git Dictionary
Rebase strategy (1/2)
Rebase strategy (2/2)
Merge strategy
Git flow