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

gisphm · Nov 20, 2012 · 614d033 · 614d033
2 parents 41c1719 + 708c819
commit 614d033
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bin/git-count b/bin/git-count
@@ -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`
diff --git a/bin/git-delete-branch b/bin/git-delete-branch
@@ -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