Features

• Structuring features modules
• Strongarm and variables
• Code structure and direct editing of values
• Reusing features modules for encapsulated code
• Drush commands (fl, fc, fe, fu, fr, fd)

References:
Features & Drush
https://drupal.org/node/960926

Git

• Quick review of git (gitconfig, .gitignore, aliases)
• Github (edit/commit UI, tags/releases, issue tracker)
• Fetch and Merge
• Git flow (master, develop, feature, release and hotfix branches)
• Git describe (for tags)
• Rebasing
• Resolving merge conflicts

gitconfig

git config core.fileMode false

Merge conflict

git mergetool -t opendiff
git config --global merge.tool opendiff

References
http://longair.net/blog/2009/04/16/git-fetch-and-merge
http://nvie.com/posts/a-successful-git-branching-model
http://git-scm.com/documentation
http://gitimmersion.com/lab_11.html
Managing Deploy Keys
https://help.github.com/articles/managing-deploy-keys

Drush

• Other commands: sql-cli, sql-drop
• Site aliases
• Shell aliases

http://drush.ws
http://drush.ws/help/examples