Your Linux Data Center Experts
Carl Baldwin

Here is my git outline.  I followed the outline set forth in Sean's and
Bob's outlines.

Getting help online
  git
  man git
  man git-status

Create a new project
  cd /tmp
  mkdir aproj
  cd aproj
  git init-db
  ...create files in this location...
  git add .
  git commit
  git log

Changes
  ...modify files in this location...
  git status
  git diff
  git commit -a
  git log

Tagging
  git tag snap-1
  gitk
  ...modify files in master branch...
  git status
  git diff
  git commit -a
  git whatchanged snap-1..HEAD
  git tag snap-2
  gitk
  git diff snap-1 snap-2
  git whatchanged -p snap-1..snap-2
  git tag -a release-1.1 snap-1

Branching
  git branch hot-fix release-1
  git checkout hot-fix
  git status
  ...make hot fix...
  git commit -a
  gitk --all
  git checkout master
  ...do more on going development...
  git commit -a
  gitk --all

Merging branches
  git checkout master
  git whatchanged HEAD..hot-fix
  git pull . hot-fix
  git status
  ...Repair conflict...
  git update-index foo
  git status
  git commit -a

Repeat merging.
  git checkout hot-fix
  git commit -a
  git checkout master
  git whatchanged HEAD..hot-fix
  git pull . hot-fix
  git status
  ...Fix conflicts...
  git update-index foo
  git commit