diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-12 22:55:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-12 22:55:44 -0700 |
| commit | dc92cc20f8dcfefcd5d79e8550736bcc437ea2e4 (patch) | |
| tree | 7d38aa79d84fe7635876ccfaacedcfe3886c7b74 /Documentation | |
| parent | d8933f013a66cc1deadf83a9c24eccb6fee78a35 (diff) | |
| parent | 8b7d4e738ee5489fecb5c4a55d14884b09e0dc6d (diff) | |
| download | git-dc92cc20f8dcfefcd5d79e8550736bcc437ea2e4.tar.gz git-dc92cc20f8dcfefcd5d79e8550736bcc437ea2e4.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-remote.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index 782b0554c..345943a26 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -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':: |