make_summ: filter out merges of older versions

diff --git a/make_summ b/make_summ
index 88006d3ccc2c3c94a38ab455d9f89c1b753a258a..15050450b94f77ff2d81ac7442f38317aa23117f 100755 (executable)
--- a/make_summ
+++ b/make_summ
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 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|^hint:' >summ
+       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:' >summ
 
 exit 0