Instead of using git-prune, pass --prune-now to gc
Added git-trial-merge, removed git-sh