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
This commit is contained in:
Junio C Hamano
2008-06-12 22:55:44 -07:00
3 changed files with 153 additions and 51 deletions

View File

@@ -12,8 +12,8 @@ SYNOPSIS
'git-remote' [-v | --verbose]
'git-remote' add [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>
'git-remote' rm <name>
'git-remote' show <name>
'git-remote' prune <name>
'git-remote' show [-n] <name>
'git-remote' prune [-n | --dry-run] <name>
'git-remote' update [group]
DESCRIPTION
@@ -80,9 +80,8 @@ These stale branches have already been removed from the remote repository
referenced by <name>, but are still locally available in
"remotes/<name>".
+
With `-n` option, the remote heads are not confirmed first with `git
ls-remote <name>`; cached information is used instead. Use with
caution.
With `--dry-run` option, report what branches will be pruned, but do no
actually prune them.
'update'::