make_summ: improve regexp

diff --git a/make_summ b/make_summ
index 0d0c7baf6dcb6cd92e2dc1c85df07d3fcfbf6498..d7fb6eec6fc8d16240adf5c8fcf5c383424c4933 100755 (executable)
--- a/make_summ
+++ b/make_summ
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 tr '\r' '\n' <merge.log |
-       grep -E '^\[|(git (cherry|rm|reset|checkout|quiltimport|merge --abort|rebase))|Merging|Applying|CONFLICT|Revert|Created commit|dropping' |
-       grep -E -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 '^(\[|  )|(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
 
 exit 0