Webdev — Git 2018 p.4

Intro

webev
summary

Recap

branches
merging
rebasing

Best practices summary

git flow
commits
config

Submodules

add and commit submodule
submodule caution
git submodule sync
ignore untracked, dirty, all
git clone --recurse-submodules
example GH
workflow caution
git subtree alternative

Hooks

local hooks
- pre-commit
- prepare-commit-msg
- commit-msg
- post-commit
- post-checkout
- pre-rebase
server hooks
- pre-receive
- update
- post-receive
hooks for tests
gitlab example
github ci example

Additional topics

resetting

Internals

patches
.git/
git bare repository
commit structure