aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-20 15:53:31 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-20 15:53:31 -0700
commitf9c2d2b14e81d48d3d04f3bb01b1579ee359edb4 (patch)
tree1c680a7b5dffe18723b5a4a84d6475e14445b031 /Documentation
parentf2fef7b55aea64104a6aee662817e1e6f0b22f71 (diff)
parente17dba8fe15028425acd6a4ebebf1b8e9377d3c6 (diff)
downloadgit-f9c2d2b14e81d48d3d04f3bb01b1579ee359edb4.tar.gz
git-f9c2d2b14e81d48d3d04f3bb01b1579ee359edb4.tar.xz
Merge branch 'nd/maint-remote-remove' into maint
* 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 a308f4c79..e8c396b5f 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