Two-day intensive hands-on Git training

This course will provide you with a deep understanding of distributed version control concepts and give you the necessary skills to succeed with Git. It will teach you how to configure and utilize Git to its full potential as the foundation for your software development process.

You will learn how to improve your software development process by exploiting some of the features that are unique to distributed version control systems. We will explore branching strategies and adaption to agile development processes.

This class is intensive and hands-on! We have a complete lab setup where you will gain fast paced experiences to take home, ready to apply in your environment. You only need to bring a laptop with Git installed.

The course is run as instructor-led presentations of each topic followed by either lab exercises or discussions. Attendees are welcome to bring questions or challenges from their own background.

Course Outline

Git concepts

• What is Git?

Git command line

• Create repos, add remotes, configure settings, alias
• The staging area
• Committing
• Tagging
• Good commit messages
• Viewing the history

Git init

• .gitconfig
• .gitignore

Git GUIs

• Graphical client interfaces (exemplified with SourceTree)

Fixing errors in commits

• Reset flavors
• Changing commit messages
• Amend
• Subtractive merges

Git branching and merging

• What is a branch?
• Git merge
• Git stash
• Rebasing branches (rewriting history)
• Squashing (rewriting history)
• CoDe:U git-flow
• Merge styles
• Resolving conflicts
• Graphical merge tools - exemplified with kdiff3

Troubleshooting with git

• Blame
• Bisect

Maintaining your git repository

• Deleting old branches
• Prune
• gc
• fsck

Distributed git

• Cloning
• Remotes
• Forking
• Fetch, pull, push
• Refs
• Rewriting history

Branching- and flow strategies

• Overview of branch and merge strategies
• Git flow
• CoDe:U git flow

Git hooks

• Client side hooks
• Server side hooks
• Enforcing policy with hooks

GitHub

• Pull-requests
• GitHub Pages