an introduction beyond the basic commit workflow

intermediate git.md

INTERMEDIATE GIT

git v2.0.0

documentation

$ cd ~/Desktop

• git help branch
• man git
• not man git branch

logistics

$ cd dev/battleship-go

• .gitignore file
• myproject/.git directory
  • what is a branch anyway?
• HTTPS vs. SSH
  • password caching

git magic

$ cd dev/battleship-go

• add --patch
  • canonicalBattleship() → canonicalBattleships() in ships.go
  • canonicalBattleship() → canonicalBattleships() in fight.go

$ cd dev/intermediate-git

• rebase --interactive
• git config --global
• git config --global alias.lo "log --oneline"
• travis-ci

cheap branches & merging

$ md dev/intermediate-git && git init

• branch a lot
• merge types
  • normal (generates a commit)
  • fast-forward merge (no changes)
  • rebase (magic)

not just for software

$ cd dev/pre-proposal

• LATEX!
• documents
  • git-annex

git GUIs

$ cd dev/cs

• official git's gui list
• GitX (mac)
• builtin gitk (visualization), git-gui (commits)
• fugitive

SGBM

$ cd dev/rpcalc

• invaluable for formal medium-to-large projects
• develop vs. master
• not ideal for small, personal, or huge (kernel, git) projects
• git-flow tool