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...