Merge branch 'om/remote-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Jun 2008 05:55:44 +0000 (22:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Jun 2008 05:55:44 +0000 (22:55 -0700)
* om/remote-fix:
"remote prune": be quiet when there is nothing to prune
remote show: list tracked remote branches with -n
remote prune: print the list of pruned branches
builtin-remote: split show_or_prune() in two separate functions
remote show: fix the -n option

Trivial merge