From 25dfc0b28eab605432dd38f42462a70fe9b49b65 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 20 Jan 2009 11:16:48 +1100 Subject: [PATCH] Add more to the summary --- make_summ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make_summ b/make_summ index 43df0b4..28e3408 100755 --- a/make_summ +++ b/make_summ @@ -1,5 +1,5 @@ #!/bin/bash -egrep '(git (cherry|rm|reset|checkout|quiltimport))|Merging|Applying|CONFLICT|Revert' merge.log | grep -v 'reset HEAD\^' >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))' >summ exit 0 -- 2.39.5