From 3bb49110800f55415c9eea938816364baf4e9eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 26 Nov 2024 15:00:27 +0100 Subject: [PATCH 1/2] Update patching guidelines --- Documentation/patching-guidelines.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/patching-guidelines.md b/Documentation/patching-guidelines.md index 698f4a5ac6..5bda9c9895 100644 --- a/Documentation/patching-guidelines.md +++ b/Documentation/patching-guidelines.md @@ -39,6 +39,8 @@ create one. > git format-patch --zero-commit --no-signature -1 -o "$PATCH_DIR/" > ``` +**Note:** Please make sure there are no other already existing patches which target same files as the newly added patch. + ## Applying Patches To apply a patch, or multiple patches, use `git am` while inside the target From 1db83eac75f9c8bd6134e15f7f8d13c5c599b323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Tue, 26 Nov 2024 15:17:05 +0100 Subject: [PATCH 2/2] Fix line length --- Documentation/patching-guidelines.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/patching-guidelines.md b/Documentation/patching-guidelines.md index 5bda9c9895..f9d7ba4f65 100644 --- a/Documentation/patching-guidelines.md +++ b/Documentation/patching-guidelines.md @@ -39,7 +39,8 @@ create one. > git format-patch --zero-commit --no-signature -1 -o "$PATCH_DIR/" > ``` -**Note:** Please make sure there are no other already existing patches which target same files as the newly added patch. +**Note:** Please make sure there are no other already existing patches +which target same files as the newly added patch. ## Applying Patches