aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2021-02-08 18:42:13 -0800
committerDaniel Borkmann <daniel@iogearbox.net>2021-02-24 17:55:28 +0100
commit69867baf9da11fece0a6b3568fb626214a95634c (patch)
tree9cff81157ea17cbc9d528c7ad85565690bf78425
parent4add6b3bdefac21dc523071c5d3520823fb4fdab (diff)
downloadpw-69867baf9da11fece0a6b3568fb626214a95634c.tar.gz
pw-pull: add more message separators
Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rwxr-xr-xpw-pull2
1 files changed, 2 insertions, 0 deletions
diff --git a/pw-pull b/pw-pull
index 90dbd3f..8302cf4 100755
--- a/pw-pull
+++ b/pw-pull
@@ -115,7 +115,9 @@ if [ "$significant_lines" -le 1 ]; then
awk 'BEGIN {e=0}
/^---/ {e=1}
/^The following changes since commit/ {e=1}
+ /^The following are changes since commit/ {e=1}
/^Please consider/ {e=1}
+ /^Please, pull these changes/ {e=1}
{if(!e) print}')
git commit --amend --signoff -F- <<EOF