From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 22 Apr 2013 08:00:55 +0000 (+1000)
Subject: make_summ: filter out merges of older versions
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=5c62e1d2fc63d0fda139ba1f9661aa51c350b87c;p=next-scripts

make_summ: filter out merges of older versions
---

diff --git a/make_summ b/make_summ
index 88006d3..1505045 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|^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