summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-11-12 22:00:25 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-11-12 22:00:25 -0800
commita5b2d4ac24ef18cf8c628e258bef8a20d9bf4b2b (patch)
tree01b2cd87612e8dab1a3208627d8b3dd03ba4a599 /Documentation
parentMerge branch 'jk/deny-push-to-current' (diff)
parentgit-remote: document the migration feature of the rename subcommand (diff)
downloadtgif-a5b2d4ac24ef18cf8c628e258bef8a20d9bf4b2b.tar.xz
Merge branch 'mv/remote-rename'
* mv/remote-rename: git-remote: document the migration feature of the rename subcommand git-remote rename: migrate from remotes/ and branches/ remote: add a new 'origin' variable to the struct Implement git remote rename
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-remote.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index bb99810ec7..fad983e297 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -11,6 +11,7 @@ SYNOPSIS
[verse]
'git remote' [-v | --verbose]
'git remote add' [-t <branch>] [-m <master>] [-f] [--mirror] <name> <url>
+'git remote rename' <old> <new>
'git remote rm' <name>
'git remote show' [-n] <name>
'git remote prune' [-n | --dry-run] <name>
@@ -61,6 +62,15 @@ only makes sense in bare repositories. If a remote uses mirror
mode, furthermore, `git push` will always behave as if `\--mirror`
was passed.
+'rename'::
+
+Rename the remote named <old> to <new>. All remote tracking branches and
+configuration settings for the remote are updated.
++
+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.
+
'rm'::
Remove the remote named <name>. All remote tracking branches and