From 5c62e1d2fc63d0fda139ba1f9661aa51c350b87c Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 22 Apr 2013 18:00:55 +1000 Subject: [PATCH] make_summ: filter out merges of older versions --- make_summ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.5