From: Stephen Rothwell Date: Wed, 19 Nov 2008 05:10:05 +0000 (+1100) Subject: make_summ: filert out cherry-picks as well X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=0097d93449f6f68352e5eff4276523c8a4cfc784;p=next-scripts make_summ: filert out cherry-picks as well --- diff --git a/make_summ b/make_summ index f04fbb5..43df0b4 100755 --- a/make_summ +++ b/make_summ @@ -1,5 +1,5 @@ #!/bin/bash -egrep '(git (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' merge.log | grep -v 'reset HEAD\^' >summ exit 0