Merge branch 'om/remote-fix'
commitdc92cc20f8dcfefcd5d79e8550736bcc437ea2e4
authorJunio C Hamano <gitster@pobox.com>
Fri, 13 Jun 2008 05:55:44 +0000 (12 22:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 13 Jun 2008 05:55:44 +0000 (12 22:55 -0700)
tree7d38aa79d84fe7635876ccfaacedcfe3886c7b74
parentd8933f013a66cc1deadf83a9c24eccb6fee78a35
parent8b7d4e738ee5489fecb5c4a55d14884b09e0dc6d
Merge branch 'om/remote-fix'

* 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