]> git.ozlabs.org Git - next-scripts/commitdiff
make_summ: update for fs-next tree
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Aug 2024 08:06:48 +0000 (18:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Aug 2024 08:06:48 +0000 (18:06 +1000)
make_summ

index d7fb6eec6fc8d16240adf5c8fcf5c383424c4933..62efc85131df61a2eed11feb9b009eff131887cc 100755 (executable)
--- a/make_summ
+++ b/make_summ
@@ -2,6 +2,6 @@
 
 tr '\r' '\n' <merge.log |
        grep -E -a '^(\[|  )|(git (cherry|rm|reset|checkout|quiltimport|merge --abort|rebase))|Merging|Applying|CONFLICT|Revert|Created commit|dropping' |
-       grep -E -a -v 'reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at|^\[master [0-9a-f]*\] (Merge( remote(-tracking)?)? branch|[0-9]*/)|^hint:|-Revert' >summ
+       grep -E -a -v 'reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at|^\[(master|fs-next) [0-9a-f]*\] (Merge( remote(-tracking)?)? branch|[0-9]*/)|^hint:|-Revert' >summ
 
 exit 0