From 24c7a86846c5b60c973158190a3553276e2bb021 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 10 Jun 2009 22:40:12 +1000 Subject: [PATCH] dump some more things fom the summary --- make_summ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.2