Book Image

Git Version Control Cookbook - Second Edition

By : Kenneth Geisshirt, Emanuele Zattin(EUR), Aske Olsson, Rasmus Voss
Book Image

Git Version Control Cookbook - Second Edition

By: Kenneth Geisshirt, Emanuele Zattin(EUR), Aske Olsson, Rasmus Voss

Overview of this book

Git is one of the most popular tools for versioning. With over 100 practical, self-contained tutorials, this updated version of the bestselling Git Version Control Cookbook examines the common pain points and best practices to help you solve problems related to versioning. Each recipe addresses a specific problem and offers a proven, best-practice solution with insights into how it works. You’ll get started by learning about the Git data model and how it stores files, along with gaining insights on how to commit changes to a database. Using simple commands, you’ll also understand how to navigate through the database. Once you have accustomed yourself to the basics, you’ll explore techniques to configure Git with the help of comprehensive examples and configuration targets. Further into the book, you’ll get up to speed with branches and recovery from mistakes. You’ll also discover the features of Git rebase and how to use regular Git to merge other branches. The later chapters will guide you in exploring Git notes and learning to utilize the update, list, and search commands. Toward the concluding chapters, you’ll focus on repository maintenance, patching, and offline sharing. By the end of this book, you’ll have grasped various tips and tricks, and have a practical understanding of best-practice solutions for common problems related to versioning.

Related Content you might be interested in

Current Title:

Small book image
Git Version Control Cookbook - Second Edition
Kenneth Geisshirt | Emanuele Zattin(EUR) | Aske Olsson | Rasmus Voss
Jul, 2018 | 354 pages
Small book image
Git Essentials
Ferdinando Santacroce
Nov, 2017 | 238 pages
Small book image
Git for Programmers
Jesse Liberty
Jun, 2021 | 264 pages
Small book image
Version Control with Git and GitHub
Joseph Muli | Alex Magana
Dec, 2018 | 344 pages
Table of Contents (19 chapters)
Title Page
Title Page
Copyright and Credits
Copyright and Credits
Packt Upsell
Packt Upsell
Contributors
Contributors
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 the history with gitk
Finding commits in the history
Searching through the history code
2
Configuration
Configuration
Introduction
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 reuse recorded resolution (rerere) to merge Git conflicts
Compute the difference between branches
Orphan branches
4
Rebasing Regularly and Interactively, and Other Use Cases
Rebasing Regularly and Interactively, and Other Use Cases
Introduction
Rebasing commits to another branch
Continuing a rebase with merge conflicts
Rebasing selected commits interactively
Squashing commits using an interactive rebase
Changing the author of commits using a rebase
Autosquashing 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 Git 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
Finding what has been achieved in the repository in the last period
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 a commit message
Creating a dynamic commit message template
Using external information in a 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 changes to files
Undo – Remove a commit and retain 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
Creating a backup of your repositories as mirror repositories
A quick "how-to" submodule
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
Tips and Tricks
Tips and Tricks
Introduction
Using git stash
Saving and applying stashes
Debugging with git bisect
Using the blame command
Coloring the 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
12
Git Providers, Integrations, and Clients
Git Providers, Integrations, and Clients
Introduction
Setting up an organization at GitHub
Creating a repository at GitHub
Adding templates for issues and pull requests
Creating a GitHub API key
Using GitHub to authenticate at Jenkins
Triggering Jenkins builds
Using Jenkinsfiles
Other Books You May Enjoy
Other Books You May Enjoy
Leave a review - let other readers know what you think
Index
Index

Creating a GitHub API key

So far, all the work we have performed at GitHub has been manual. Programmers like to automate processes, and performing GitHub work is no exception to that rule. With the next recipe, we will show you how you can automate tasks.

Getting ready

To automate GitHub tasks you need to be able to access GitHub. Instead of logging in using a user name and password, you can use an API key or personal access token. Such a token should not be shared, and you need to keep it secret at all times.

So, this recipe begins with generating an access token and shows you a simple Python script. The Python script will find all your repositories, and find all the pull requests for each repository.

 

How to do it...

  1. First, we need to generate the personal access token. You will have to drill down in the menu system: Settings, Developer settings, and finally, Person access token. We will give our token the name basic-query since we plan only to do that. You can specify what the token has access...
Previous Section
End of Section 6
Next Section