sh 来自http://rypress.com/tutorials/git/patch-workflows

Posted 2021-05-07

$ cd ../marys-repo
$ git checkout master
$ git fetch origin
$ git rebase origin/master
$ git branch -D pink-page
$ git clean -f

$ git checkout master
$ git merge patch-integration
$ git branch -d patch-integration
$ git clean -f
$ git push origin master

$ cd ../my-git-repo
$ git checkout -b patch-integration
$ git am < 0001-Change-pink-to-a-manly-color.patch
$ git log master..HEAD --stat


$ git am < 0002-Add-a-pink-block-of-color.patch
$ git log master..HEAD --stat

$ git format-patch master

git commit -a -m "Add a pink block of color"

# Patch for every commit 
$ git format-patch master

# creates 0001-Change-pink-to-a-manly-color.patch

# Change
$ git checkout -b pink-page
$ git commit -a -m "Change pink to a manly color"