Search icon CANCEL
Subscription
0
Cart icon
Your Cart (0 item)
Close icon
You have no products in your basket yet
Arrow left icon
Explore Products
Best Sellers
New Releases
Books
Videos
Audiobooks
Learning Hub
Conferences
Free Learning
Arrow right icon
Arrow up icon
GO TO TOP
Git: Mastering Version Control

You're reading from   Git: Mastering Version Control ...

Arrow left icon
Product type Course
Published in Oct 2016
Publisher
ISBN-13 9781787123205
Length 861 pages
Edition 1st Edition
Languages
Tools
Arrow right icon
Authors (4):
Arrow left icon
Ferdinando Santacroce Ferdinando Santacroce
Author Profile Icon Ferdinando Santacroce
Ferdinando Santacroce
Aske Olsson Aske Olsson
Author Profile Icon Aske Olsson
Aske Olsson
Jakub Narębski Jakub Narębski
Author Profile Icon Jakub Narębski
Jakub Narębski
Rasmus Voss Rasmus Voss
Author Profile Icon Rasmus Voss
Rasmus Voss
Arrow right icon
View More author details
Toc

Table of Contents (36) Chapters Close

Git: Mastering Version Control
Credits
Preface
1. Getting Started with Git FREE CHAPTER 2. Git Fundamentals – Working Locally 3. Git Fundamentals – Working Remotely 4. Git Fundamentals – Niche Concepts, Configurations, and Commands 5. Obtaining the Most – Good Commits and Workflows 6. Migrating to Git 7. Git Resources 8. Navigating Git 9. Configuration 10. Branching, Merging, and Options 11. Rebase Regularly and Interactively, and Other Use Cases 12. Storing Additional Information in Your Repository 13. Extracting Data from the Repository 14. Enhancing Your Daily Work with Git Hooks, Aliases, and Scripts 15. Recovering from Mistakes 16. Repository Maintenance 17. Patching and Offline Sharing 18. Git Plumbing and Attributes 19. Tips and Tricks 20. Git Basics in Practice 21. Exploring Project History 22. Developing with Git 23. Managing Your Worktree 24. Collaborative Development with Git 25. Advanced Branching Techniques 26. Merging Changes Together 27. Keeping History Clean 28. Managing Subprojects – Building a Living Framework 29. Customizing and Extending Git 30. Git Administration 31. Git Best Practices Bibliography
Index

Applying patches


Now we know how to create patches from commits. It is time to learn to apply them.

Getting ready

We'll use the repository from the previous examples along with the generated patches as follows:

$ cd offline-sharing 
$ git checkout master
$ ls -1a
.
..
.git
Makefile
README.md
another_pi.c
latest-commit
math.c
not-on-master

How to do it...

First, we'll checkout the develop branch and apply the patch generated from the master branch (0001-Calculate-pi-with-more-digits.patch) in the first example. We use the Git command am to apply the patches; am is short for apply from mailbox:

$ git checkout develop
Your branch is up-to-date with 'origin/develop'.
$ git am latest-commit/0001-Calculate-pi-with-more-digits.patch
Applying: Calculate pi with more digits

We can also apply the master branch to the series of patches that was generated from the develop branch as follows:

$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
$ git am not-on...
lock icon The rest of the chapter is locked
Register for a free Packt account to unlock a world of extra content!
A free Packt account unlocks extra newsletters, articles, discounted offers, and much more. Start advancing your knowledge today.
Unlock this book and the full library FREE for 7 days
Get unlimited access to 7000+ expert-authored eBooks and videos courses covering every tech area you can think of
Renews at $19.99/month. Cancel anytime
Banner background image