-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
22 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
|
||
# Some notes on how to do backports | ||
|
||
I'm currently figuring out how to do this properly, these are just notes, so I don't have to find everything again. | ||
|
||
https://stackoverflow.com/questions/40757246/git-status-and-git-diff-empty-after-failed-git-am | ||
|
||
git remote add patch-origin <path> | ||
git fetch patch-origin | ||
|
||
|
||
|
||
git format-patch -1 | ||
|
||
|
||
git am --ignore-whitespace --ignore-space-change -3 < | ||
|
||
git am --continue | ||
|
||
git mergetool | ||
|
||
|