make_summ: filert out cherry-picks as well

diff --git a/make_summ b/make_summ
index f04fbb54e4d6707101f9888b4e71efa608e8a8e9..43df0b407b5e3d63f5dc22a62e3ad195fd14f960 100755 (executable)
--- a/make_summ
+++ b/make_summ
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-egrep '(git (rm|reset|checkout|quiltimport))|Merging|Applying|CONFLICT|Revert' merge.log | grep -v 'reset HEAD\^' >summ
+egrep '(git (cherry|rm|reset|checkout|quiltimport))|Merging|Applying|CONFLICT|Revert' merge.log | grep -v 'reset HEAD\^' >summ
 
 exit 0