]> git.ozlabs.org Git - next-scripts/blobdiff - make_summ
dump some more things fom the summary
[next-scripts] / make_summ
index d8398285505d2b5771040f5652ab88fde186df1e..9afc3211920433365c953cf3b48deee5091628f8 100755 (executable)
--- 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