Share
Home > Version control with Git

Version control with Git

In this course attendees will learn how to develop and manage software projects using Git as a version control tool.

The following topics will be covered:

  • What is a version control system, types of version control systems, advantages of a distributed version control system, history of Git and key features, installing and configuring Git, introduction to basic version control management with Git, graphical user interfaces for Git.
  • Delta-based and snapshot-based version control systems, types of files in Git (tracked, untracked, ignored), states of a tracked file (commited, modified, staged), sections of a Git repository (working directory, staging/index, repository), initializing a Git repository, showing the repository status, adding files to the repository, commiting files, modifying files, displaying the difference between working directory, index and repository, removing and renaming files, creating aliases.
  • Branching concepts, creating, listing and removing branches, what is the HEAD, changing branches, doing commits in a separate branch, displaying a graphical representation of the commits history, merging branches, fast-forward merges, generating merge commits, resolving merge conflicts, comparing merge and rebase, displaying history of changes in HEAD, concepts of a tag, the two types of tags (lightweight and annotated), creating and listing tags, comparing branches and tags.
  • Searching and filtering the history of a Git repository, the various ways to reference a commit in the repository, defining commit ranges, filtering the commit history with the log command, comparing the repository files, searching for strings and regular expressions in the repository, doing searches with the pickaxe feature, techniques to identify problems in the source code with blame and bisect.
  • Rewriting the repository commit history, squashing and dividing commits, reordering and removing commits, amending commits, using the rebase feature to rewrite commit history, moving a branch and HEAD to any commit, retrieving contents of the index and working directory, retrieving an older version of a repository file, reintroducing commits into the repository, reversing commits, saving and clearing the working directory.
  • Introduction to the inner workings of Git, the contents and organization of the .git / directory, the types of repository objects (blob, tree, commit, tag), how objects are stored in the repository, the object hash, manually adding a blob object to the repository, listing information about a repository object, adding objects to the index and creating a tree object, creating a commit object, setting up references to commit objects and moving HEAD, creating tag objects, Git objects compression and the garbage collection.
  • Managing and working with remote repositories, cloning a remote repository on a local machine, protocols supported by Git, listing, adding and removing remote repositories, tracking remote branches, pushing changes to a remote repository, fetching changes from a remote repository, merge or rebase changes to the local repository, creating and removing remote branches, sharing tags, formatting and applying patches, sending patches by email.
  • Establishing a development workflow with Git, examples of common development workflows, studying github flow and git-flow, comparing fast-forward with merge commits, releasing releases with branches and tags, good practices for defining a commit message, tips and suggestions to establish workflows, generating an application build number with Git, working with submodules, implementing hook scripts.

For more details on the content of this training session, you can download the full agenda and the training slides (in Portuguese).

The slides of this training session are released under the Creative Commons BY-SA 3.0 license, and the source code can be found here.

Some pictures of training sessions already presented are available here.

Audience

Students, engineers, systems analysts, software developers, leaders and managers of software development teams.

Requirements

Attendees should know the basics of the command line interface, experience with software development and desirable (but not required) experience with a version control tool (CVS, Subversion, Perforce, TFVC, etc).

Material

The course material contains the slides of the presentations, book of activities and exercises, reference guides, and additional reference documents. All materials will be provided in an electronic format at the start of the training session.

Open sessions

The open training sessions are presented in a pleasant environment, with a properly equipped laboratory and Internet access. Classes are usually presented full time, with a stop for lunch and a coffee break in the morning.

If you are interested in participating in the training but there is no open session available, please fill the pre-registration form clicking here. We will contact you as soon as a new training session is opened.

In-company sessions

If you plan to train your team or a group of people, consider a training session in your company.

In-company classes have the same characteristics of an open training session. In this model, the company is responsible for providing the necessary resources needed for the training, including room, data projector and development machines. This model also brings big advantages for the company, since the cost of transportation and accommodation of several employees is reduced only to the instructor.

If your company has a special requirement, we can study a program that meets your needs in a specific way, like preparing the training material for a specific hardware platform or developing additional content. Do not hesitate to contact us by e-mail or leaving a message in the contact page.

Take the training to your city

You can take the training session to your community at any city in Brazil!

Can't afford to take the course in São Paulo? Do you have a study group and want to learn more about a specific technology? Do you coordinate or participate in the coordination of a course at your university and would like to train the teachers and students? Do you have a space and would like to get some friends together and spend enjoyable hours learning about embedded systems?

Send an e-mail or leave a message in the contact page. Send the name of the course you are interested and the city. If we can get together a group of interested people, we can bring the training to your city!

Questions?

If you have any question, please send an e-mail or leave us a message on the contact page.

Contact us