Git

Distributed.
Everything is local.

Getting started . . .


git init
OR
git clone

git status

• untracked (git add)
• unmodified
• modified (git add)
• staged (git commit) careful!
• unmodified

git diff
working:staged

git diff --staged
staged:last commit

Branching. Git's killer feature.

"Git encourages a workflow that branches and merges often, even multiple times in a day."

A branch is a pointer to one commit
git branch branchname

HEAD points to your current branch

git checkout branchname

Git identifies the common ancestor for merging

git merge branchname
"fast-forward"

Remotes.

git remote add shortname url
git remote -v
git remote show shortname

git fetch
:gets but does not merge
git pull
:gets and attempts to merge

Remote Branches

• Local pointer for remote commits  
• (remote)/(branch)
• git fetch updates pointers
• git fetch brings down new branches
• checkout new branches for working copy