X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=make_summ;h=9570e9d6aef80afe04891ff4c647290f4087c378;hb=2ffbfb5f40f0e3443e9357739bb8d39ddc762521;hp=15050450b94f77ff2d81ac7442f38317aa23117f;hpb=61dfd1cb7587d911df28c93425fe4004c998c541;p=next-scripts diff --git a/make_summ b/make_summ index 1505045..9570e9d 100755 --- 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|[0-9]*/)|^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:|-Revert' >summ exit 0