Browse Library
Sign In Start Free Trial
Close icon Search icon
Account
Browse Library Advanced Search Sign In Start Free Trial

Add to playlist

Create a Playlist

Modal Close icon
You need to login to use this feature.
  • Book Overview & Buying Git Version Control Cookbook
  • Table Of Contents Toc
  • Feedback & Rating feedback
Git Version Control Cookbook

Git Version Control Cookbook

By : Olsson, Voss
4 (3)
Buy this Book
close
close
Git Version Control Cookbook

Git Version Control Cookbook

4 (3)
By: Olsson, Voss
Buy this Book

Overview of this book

This practical guide contains a wide variety of recipes, taking you through all the topics you need to know about to fully utilize the most advanced features of the Git system. If you are a software developer or a build and release engineer who uses Git in your daily work and want to take your Git knowledge to the next level, then this book is for you. To understand and follow the recipes included in this book, basic knowledge of Git command-line code is mandatory.
Table of Contents (14 chapters)
close
close
close
Preface
Icon
Preface
Icon
What this book covers
Icon
What you need for this book
Icon
Who this book is for
Icon
Conventions
Icon
Reader feedback
Icon
Customer support
Free Chapter
1
1. Navigating Git
Icon
1. Navigating Git
Icon
Introduction
Icon
Git's objects
Icon
The three stages
Icon
Viewing the DAG
Icon
Extracting fixed issues
Icon
Getting a list of the changed files
Icon
Viewing history with Gitk
Icon
Finding commits in history
Icon
Searching through history code
2
2. Configuration
Icon
2. Configuration
Icon
Configuration targets
Icon
Querying the existing configuration
Icon
Templates
Icon
A .git directory template
Icon
A few configuration examples
Icon
Git aliases
Icon
The refspec exemplified
3
3. Branching, Merging, and Options
Icon
3. Branching, Merging, and Options
Icon
Introduction
Icon
Managing your local branches
Icon
Branches with remotes
Icon
Forcing a merge commit
Icon
Using git rerere to merge known conflicts
Icon
The difference between branches
4
4. Rebase Regularly and Interactively, and Other Use Cases
Icon
4. Rebase Regularly and Interactively, and Other Use Cases
Icon
Introduction
Icon
Rebasing commits to another branch
Icon
Continuing a rebase with merge conflicts
Icon
Rebasing selective commits interactively
Icon
Squashing commits using an interactive rebase
Icon
Changing the author of commits using a rebase
Icon
Auto-squashing commits
5
5. Storing Additional Information in Your Repository
Icon
5. Storing Additional Information in Your Repository
Icon
Introduction
Icon
Adding your first Git note
Icon
Separating notes by category
Icon
Retrieving notes from the remote repository
Icon
Pushing notes to a remote repository
Icon
Tagging commits in the repository
6
6. Extracting Data from the Repository
Icon
6. Extracting Data from the Repository
Icon
Introduction
Icon
Extracting the top contributor
Icon
Finding bottlenecks in the source tree
Icon
Grepping the commit messages
Icon
The contents of the releases
7
7. Enhancing Your Daily Work with Git Hooks, Aliases, and Scripts
Icon
7. Enhancing Your Daily Work with Git Hooks, Aliases, and Scripts
Icon
Introduction
Icon
Using a branch description in the commit message
Icon
Creating a dynamic commit message template
Icon
Using external information in the commit message
Icon
Preventing the push of specific commits
Icon
Configuring and using Git aliases
Icon
Configuring and using Git scripts
Icon
Setting up and using a commit template
8
8. Recovering from Mistakes
Icon
8. Recovering from Mistakes
Icon
Introduction
Icon
Undo – remove a commit completely
Icon
Undo – remove a commit and retain the changes to files
Icon
Undo – remove a commit and retain the changes in the staging area
Icon
Undo – working with a dirty area
Icon
Redo – recreate the latest commit with new changes
Icon
Revert – undo the changes introduced by a commit
Icon
Reverting a merge
Icon
Viewing past Git actions with git reflog
Icon
Finding lost changes with git fsck
9
9. Repository Maintenance
chevron up
Icon
9. Repository Maintenance
Icon
Introduction
Icon
Pruning remote branches
Icon
Running garbage collection manually
Icon
Turning off automatic garbage collection
Icon
Splitting a repository
Icon
Rewriting history – changing a single file
Icon
Back up your repositories as mirror repositories
Icon
A quick submodule how-to
Icon
Subtree merging
Icon
Submodule versus subtree merging
10
10. Patching and Offline Sharing
Icon
10. Patching and Offline Sharing
Icon
Introduction
Icon
Creating patches
Icon
Creating patches from branches
Icon
Applying patches
Icon
Sending patches
Icon
Creating Git bundles
Icon
Using a Git bundle
Icon
Creating archives from a tree
11
11. Git Plumbing and Attributes
Icon
11. Git Plumbing and Attributes
Icon
Introduction
Icon
Displaying the repository information
Icon
Displaying the tree information
Icon
Displaying the file information
Icon
Writing a blob object to the database
Icon
Writing a tree object to the database
Icon
Writing a commit object to the database
Icon
Keyword expansion with attribute filters
Icon
Metadata diff of binary files
Icon
Storing binaries elsewhere
Icon
Checking the attributes of a file
Icon
Attributes to export an archive
12
12. Tips and Tricks
Icon
12. Tips and Tricks
Icon
Introduction
Icon
Using git stash
Icon
Saving and applying stashes
Icon
Debugging with git bisect
Icon
Using the blame command
Icon
Color UI in the prompt
Icon
Autocompletion
Icon
Bash prompt with status information
Icon
More aliases
Icon
Interactive add
Icon
Interactive add with Git GUI
Icon
Ignoring files
Icon
Showing and cleaning ignored files
13
Index
Icon
Index

Submodule versus subtree merging

There is no easy answer to the question of whether or not to use submodules or subtree merging for a project. When choosing submodule, a lot of extra pressure is put on the developers working on the project as they need to make sure they keep the submodule and the super project in sync. When choosing to add a project by subtree merging, no or little extra complexity is added for developers. The repository maintainer, however, needs to make sure the subproject is up to date and that commits are added back to the subproject. Both methods work and are in use, and it is probably just a matter of getting used to either method before finding it natural to use. A completely different solution is to use the build system of the super project to fetch the necessary dependencies, as for example, Maven or Gradle does.

Unlock full access

Continue reading for free

A Packt free trial gives you instant online access to our library of over 7000 practical eBooks and videos, constantly updated with the latest in tech
Start a 7-day FREE trial
End of Section 9
Next Section

Create a Note

Modal Close icon
You need to login to use this feature.
notes
bookmark search playlist font-size

Change the font size

margin-width

Change margin width

day-mode

Change background colour

Close icon Search
Country selected
Close icon Your notes and bookmarks

Delete Bookmark

Modal Close icon
Are you sure you want to delete it?
Cancel
Yes, Delete

Delete Note

Modal Close icon
Are you sure you want to delete it?
Cancel
Yes, Delete

Edit Note

Modal Close icon
Write a note (max 255 characters)
Cancel
Update Note

Confirmation

Modal Close icon
claim successful
Order Page Read Now

Buy this book with your credits?

Modal Close icon
Are you sure you want to buy this book with one of your credits?
Close
YES, BUY