Closed kortemik closed 2 weeks ago
it seems github uses format-patch with different options, so it may be preferable to push ones locally applied branch to ones github fork and gererate a patch from there. it should only have a header change like following:
--- f46fa15d16ae3a0b918acdf21e75278cf6a2a198.patch 2024-08-26 11:27:16.896398233 +0300
+++ 214d4ccd0ed39e6505038f2d2c52499462f88f87.patch 2024-08-26 11:33:55.004671179 +0300
@@ -1,7 +1,7 @@
-From f46fa15d16ae3a0b918acdf21e75278cf6a2a198 Mon Sep 17 00:00:00 2001
+From 214d4ccd0ed39e6505038f2d2c52499462f88f87 Mon Sep 17 00:00:00 2001
From: x e <x@example.tld>
-Date: Mon, 26 Aug 2024 11:20:04 +0300
-Subject: [PATCH] apply spotless
+Date: Mon, 26 Aug 2024 11:26:27 +0300
+Subject: [PATCH] applied one
---
pom.xml
first commit adds spotless, second one applies it.
please conduct the review as follows:
git checkout -b temp-20240826
andgit apply 265a19499d39c9cdc27667ef930f1f4000375b44.patch
and commit the changes.mvn spotless:apply
commit the changes and create a patch from the latest commit usinggit format-patch -1
diff -Naur f46fa15d16ae3a0b918acdf21e75278cf6a2a198.patch 0001-applied-one.patch
or just review the files.