Merge branch 'master' of github.com:visionmedia/git-extras

This commit is contained in:
TJ Holowaychuk 2012-11-20 15:18:14 -08:00
commit 614d03364a
2 changed files with 4 additions and 3 deletions

View file

@ -1,8 +1,8 @@
#!/bin/sh
if test "$1" = "--all"; then
git shortlog -n $@ | grep "):$" | sed 's|:||'
git shortlog -n -s $@ | awk '{print substr($0,index($0,$2)) " (" $1 ")"}'
echo
fi
echo total `git log --oneline | wc -l`
echo total `git rev-list --count HEAD`

View file

@ -3,4 +3,5 @@
branch=$1
test -z $branch && echo "branch required." 1>&2 && exit 1
git branch -D $branch
git branch -d -r origin/$branch && git push origin :$branch
git branch -d -r origin/$branch
git push origin :$branch