From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 10 Jun 2009 12:40:12 +0000 (+1000)
Subject: dump some more things fom the summary
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;ds=sidebyside;h=24c7a86846c5b60c973158190a3553276e2bb021;p=next-scripts

dump some more things fom the summary
---

diff --git a/make_summ b/make_summ
index d839828..9afc321 100755
--- a/make_summ
+++ b/make_summ
@@ -1,5 +1,5 @@
 #!/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)|mark the corrected paths)' >summ
+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)|mark the corrected paths|HEAD is now at)' >summ
 
 exit 0