3. Configuration
● ~/.gitconfig, .git/ in local repo
● various git commands
● .gitignore in local repo root (regexps)
● exclude file in .git/info/ (not versioned)
5. git add
● index = staging = "the next patch"
● not all modified/added files have to be
included in the next commit
● untracked files appear in all branches
● git add .
● git commit -a
9. git branch
● light
● quick
● branch per feature
git branch branch_name (create)
git checkout branch_name (switch)
git checkout -b branch_name (create and switch)
git push origin branch (push local branch to remote)
git branch lbranch origin/rbranch (map remote to local)
10. git merge
git merge feature_branch
create new (one) commit containing all
changes (one or more commits) from the
branch being merged
11. conflict
● merged files end up in staging area
● git explicitly says which files contain
unresolved conflicts after merge
● user manually resolves conflicts
● user adds resolved files to staging