check_commits: tidy up a bit

[next-scripts] / make_summ

diff --git a/make_summ b/make_summ
index 9afc3211920433365c953cf3b48deee5091628f8..9570e9d6aef80afe04891ff4c647290f4087c378 100755 (executable)
--- a/make_summ
+++ b/make_summ
@@ -1,5 +1,6 @@
 #!/bin/bash
 
-egrep '(git (cherry|rm|reset|checkout|quiltimport))|Merging|Applying|CONFLICT|Revert|Created commit' merge.log | egrep -v '(reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at)' >summ
+egrep '^\[|(git (cherry|rm|reset|checkout|quiltimport|merge --abort))|Merging|Applying|CONFLICT|Revert|Created commit' merge.log |
+       egrep -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
 
 exit 0