X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=make_summ;h=73e5ee4756e251cbd024c38224b96574c655e2da;hb=HEAD;hp=28e340824762603b85ce6b24ec7100a82f886415;hpb=25dfc0b28eab605432dd38f42462a70fe9b49b65;p=next-scripts

diff --git a/make_summ b/make_summ
index 28e3408..73e5ee4 100755
--- a/make_summ
+++ b/make_summ
@@ -1,5 +1,7 @@
 #!/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))' >summ
+tr '\r' '\n' <merge.log |
+	egrep '^\[|(git (cherry|rm|reset|checkout|quiltimport|merge --abort|rebase))|Merging|Applying|CONFLICT|Revert|Created commit|dropping' |
+	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