summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-09-12 14:21:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-12 14:21:58 -0700
commit90585604a72aaf56158069023dbcc6a61c6d7d50 (patch)
tree9a13a38bfbe96699c56686e385793840bda6ee24 /Documentation
parentMerge branch 'nd/log-n-doc' (diff)
parentremote: prefer subcommand name 'remove' to 'rm' (diff)
downloadtgif-90585604a72aaf56158069023dbcc6a61c6d7d50.tar.xz
Merge branch 'nd/maint-remote-remove'
* nd/maint-remote-remove: remote: prefer subcommand name 'remove' to 'rm'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-remote.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index a308f4c79f..e8c396b5f9 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -12,7 +12,7 @@ SYNOPSIS
'git remote' [-v | --verbose]
'git remote add' [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>
'git remote rename' <old> <new>
-'git remote rm' <name>
+'git remote remove' <name>
'git remote set-head' <name> (-a | -d | <branch>)
'git remote set-branches' [--add] <name> <branch>...
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
@@ -85,6 +85,7 @@ In case <old> and <new> are the same, and <old> is a file under
`$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to
the configuration file format.
+'remove'::
'rm'::
Remove the remote named <name>. All remote-tracking branches and