Book Image

Git Version Control Cookbook

Book Image

Git Version Control Cookbook

Overview of this book

Related Content you might be interested in

Current Title:

Small book image
Git Version Control Cookbook
Jul, 2014 | 340 pages
No titles found
Table of Contents (19 chapters)
Git Version Control Cookbook
Git Version Control Cookbook
Credits
Credits
About the Authors
About the Authors
About the Reviewers
About the Reviewers
www.PacktPub.com
www.PacktPub.com
Preface
Preface
Free Chapter
1
Navigating Git
Navigating Git
Introduction
Git's objects
The three stages
Viewing the DAG
Extracting fixed issues
Getting a list of the changed files
Viewing history with Gitk
Finding commits in history
Searching through history code
2
Configuration
Configuration
Configuration targets
Querying the existing configuration
Templates
A .git directory template
A few configuration examples
Git aliases
The refspec exemplified
3
Branching, Merging, and Options
Branching, Merging, and Options
Introduction
Managing your local branches
Branches with remotes
Forcing a merge commit
Using git rerere to merge known conflicts
The difference between branches
4
Rebase Regularly and Interactively, and Other Use Cases
Rebase Regularly and Interactively, and Other Use Cases
Introduction
Rebasing commits to another branch
Continuing a rebase with merge conflicts
Rebasing selective commits interactively
Squashing commits using an interactive rebase
Changing the author of commits using a rebase
Auto-squashing commits
5
Storing Additional Information in Your Repository
Storing Additional Information in Your Repository
Introduction
Adding your first Git note
Separating notes by category
Retrieving notes from the remote repository
Pushing notes to a remote repository
Tagging commits in the repository
6
Extracting Data from the Repository
Extracting Data from the Repository
Introduction
Extracting the top contributor
Finding bottlenecks in the source tree
Grepping the commit messages
The contents of the releases
7
Enhancing Your Daily Work with Git Hooks, Aliases, and Scripts
Enhancing Your Daily Work with Git Hooks, Aliases, and Scripts
Introduction
Using a branch description in the commit message
Creating a dynamic commit message template
Using external information in the commit message
Preventing the push of specific commits
Configuring and using Git aliases
Configuring and using Git scripts
Setting up and using a commit template
8
Recovering from Mistakes
Recovering from Mistakes
Introduction
Undo – remove a commit completely
Undo – remove a commit and retain the changes to files
Undo – remove a commit and retain the changes in the staging area
Undo – working with a dirty area
Redo – recreate the latest commit with new changes
Revert – undo the changes introduced by a commit
Reverting a merge
Viewing past Git actions with git reflog
Finding lost changes with git fsck
9
Repository Maintenance
Repository Maintenance
Introduction
Pruning remote branches
Running garbage collection manually
Turning off automatic garbage collection
Splitting a repository
Rewriting history – changing a single file
Back up your repositories as mirror repositories
A quick submodule how-to
Subtree merging
Submodule versus subtree merging
10
Patching and Offline Sharing
Patching and Offline Sharing
Introduction
Creating patches
Creating patches from branches
Applying patches
Sending patches
Creating Git bundles
Using a Git bundle
Creating archives from a tree
11
Git Plumbing and Attributes
Git Plumbing and Attributes
Introduction
Displaying the repository information
Displaying the tree information
Displaying the file information
Writing a blob object to the database
Writing a tree object to the database
Writing a commit object to the database
Keyword expansion with attribute filters
Metadata diff of binary files
Storing binaries elsewhere
Checking the attributes of a file
Attributes to export an archive
12
Tips and Tricks
Tips and Tricks
Introduction
Using git stash
Saving and applying stashes
Debugging with git bisect
Using the blame command
Color UI in the prompt
Autocompletion
Bash prompt with status information
More aliases
Interactive add
Interactive add with Git GUI
Ignoring files
Showing and cleaning ignored files
Index
Index

About the Authors

Aske Olsson has more than 10 years of experience in the software industry. With a background as an electrical engineer, he has used every tool available for development, from a soldering iron over Assembly, C, and Java programming to different SCM, build– and issue–tracking systems.

Aske has worked for Nokia for 6 years, where he was one of the leading forces behind complex tool transformation and renewal projects. Among them was a broad adoption of Git SCM, Gerrit Code Review, and Jenkins CI.

Currently, Aske works at Schantz, a company developing advanced IT solutions for the financial sector. He develops and maintains their continuous delivery pipeline.

Aske is also one of the four founding partners in the software development tools and processes company Switch-Gears ApS, where he helps customers, large and small, increase the maturity and productivity of their software delivery efforts by moving the customers from legacy tools and working modes to modern open source based tools and processes.

Aske has more than 4 years of experience working with Git, and since 2011, he has been teaching Git in regular training sessions, from basic Git to its advanced usage.

First, I would like to thank my wife and two kids (soon to be three) for supporting me and putting up with me while writing this book.

I would also like to thank Rasmus Voss for co-authoring the book with me. Last but not least, I would like to thank Knud Poulsen, Emanuele Zattin, Lars Pedersen, and the rest of the tool renewal team at Nokia for all the good discussions around Git.

Rasmus Voss is specialized in continuous integration, software releasing, and process automation. His vast knowledge on these areas has been built by a 10-year career in Nokia mobile phones in Copenhagen, Denmark and Beijing, China, where he started optimizing autotesting for the Series 30 platform. He later moved to software releasing and became part of the team that upgraded the software delivery chain from an old version control system CM Synergy to Git, incorporating Gerrit for code review and Jenkins for single commit verification, software releasing, and much more. Rasmus spent 2 years in China working for Nokia where he sparred with developers, release managers, test engineers, and leaders to optimize the process so that developers could spend time coding and testers knew what they were testing.

Today, Rasmus has his own company VossCon, where he consults with companies on how to make the most of developers and testers by optimizing software releasing, providing visibility in the delivery chain, upgrading the tool chain, automating tedious processes, and training developers. He also holds courses on Git, Gerrit, and Jenkins.

First and foremost, I would like to thank my wife and four kids for putting up with me and the stress it has been moving back to Denmark while starting a company, writing a book, and also trying to be the best family father I could be.

I would also like to thank Nokia for the career opportunities they gave me. Thanks to Aske Olsson for co-authoring the book with me. Thanks to Jonas Christensen from Schneider Electric who signed the first contract for my company. Thanks to Knud Poulsen for introducing me to Git, Gerrit, and Jenkins.

Previous Section
Next Chapter