also, we don't need to push out the gitk.cache from any dir
#!/bin/bash
-egrep '^\[|(git (cherry|rm|reset|checkout|quiltimport|merge --abort))|Merging|Applying|CONFLICT|Revert|Created commit' merge.log |
+tr '\r' '\n' <merge.log |
+ egrep '^\[|(git (cherry|rm|reset|checkout|quiltimport|merge --abort|rebase))|Merging|Applying|CONFLICT|Revert|Created commit|dropping' |
egrep -v 'reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at|^\[master [0-9a-f]*\] (Merge( remote(-tracking)?)? branch|[0-9]*/)|^hint:|-Revert' >summ
exit 0
. "$(dirname $0)/common.sh"
-rsync -avHSXx --noatime --exclude next-history.git --exclude stats --exclude next/.git/gitk.cache --delete ~/kernels/next/. ${build_host}:kernels/next/.
+rsync -avHSXx --noatime --exclude next-history.git --exclude stats --exclude gitk.cache --delete ~/kernels/next/. ${build_host}:kernels/next/.