Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jesús Espino 2012-06-26 10:46:10 +02:00
commit 479bdce215
2 changed files with 3 additions and 1 deletions

2
bin/git-delete-merged-branches Executable file
View file

@ -0,0 +1,2 @@
#!/bin/sh
git branch --merged | grep -v "*" | xargs git delete-branch

View file

@ -67,8 +67,8 @@ repository_age() {
echo
echo " project : $project"
echo " repo age :" $(repository_age)
echo " commits :" $(commit_count)
echo " active :" $(active_days) days
echo " commits :" $(commit_count)
if test "$commit" = ""; then
echo " files :" $(file_count)
fi