update to_build_host a bit

[next-scripts] / make_summ

diff --git a/make_summ b/make_summ
index 15050450b94f77ff2d81ac7442f38317aa23117f..73e5ee4756e251cbd024c38224b96574c655e2da 100755 (executable)
--- a/make_summ
+++ b/make_summ
@@ -1,6 +1,7 @@
 #!/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|[0-9]*/)|^hint:' >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