Git: Distributed Version Control--Fundamentals and Workflows
- 3h 10m
- Bjørn Stachmann, René Preißel
- Brainy Software Corp.
- 2014
Git is the most popular version-control system today for many reasons: it comes with great tools for developers to work in parallel, offers flexibility and performance, allows you to work offline or in multisite development, is robust against failures and attacks, and has a strong open-source community. This book explains the basic concepts of Git, with introductory chapters to get you up to speed. The authors focus on agile development and provide workflows that show the necessary commands and options for solving real-world problems. Some of the topics discussed include commits and the commit history, the repository, parallel development with branches, merging and conflict resolution, rebasing, version tagging, submodules and subtrees, troubleshooting with bisection, splitting a large project, merging small projects, and migrating to Git.
About the Authors
René Preißel is a freelance software architect, developer, and trainer who has been involved in the development of object-oriented applications and frameworks for many years. His work is focused on architecture, Java EE, and configuration management.
Bjørn Stachmann is a senior software engineer with a focus on software architecture for a company in Hamburg, Germany, where he supervises product development in PHP, Java, and C++.
In this Book
-
Introduction
-
Basic Concepts
-
Getting Started
-
What is a Commit?
-
Multiple Commits
-
The Repository
-
Branches
-
Merging Branches
-
A Cleaner History with Rebasing
-
Exchanges between Repositories
-
Version Tagging
-
Dependencies between Repositories
-
Tips and Tricks
-
Introduction to Workflows
-
Project Setup
-
Developing on the Same Branch
-
Developing with Feature Branches
-
Troubleshooting with Bisection
-
Working with a Build Server
-
Performing a Release
-
Splitting a Large Project
-
Merging Small Projects
-
Outsourcing Long Histories
-
Using other Version Controls in Parallel
-
Migrating to Git
-
What Else is There?
-
Git's Shortcomings
