From 67a9002152b58764e036333a6e0a1f40fee12ef0 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 16 Sep 2022 19:33:23 +0200 Subject: [PATCH] Added a backports md file. WIP. --- backports.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 backports.md diff --git a/backports.md b/backports.md new file mode 100644 index 000000000..c3018b3be --- /dev/null +++ b/backports.md @@ -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 +git fetch patch-origin + + + +git format-patch -1 + + +git am --ignore-whitespace --ignore-space-change -3 < + +git am --continue + +git mergetool + +