summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-06 17:38:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-06 17:38:14 (GMT)
commitcea667e955cca71e517f259c86bf974d03064df2 (patch)
tree372f6751be6b5cfbc8cd9a944918612afcfca173 /Documentation
parent7e3ead13e526f67d528e3eea50b1441bdccb62f8 (diff)
parent099024861021830f9d4c7db4c64c844bf9d5ebd9 (diff)
downloadgit-cea667e955cca71e517f259c86bf974d03064df2.zip
git-cea667e955cca71e517f259c86bf974d03064df2.tar.gz
git-cea667e955cca71e517f259c86bf974d03064df2.tar.bz2
Merge branch 'jk/maint-remote-mirror-safer'
* jk/maint-remote-mirror-safer: remote: deprecate --mirror remote: separate the concept of push and fetch mirrors remote: disallow some nonsensical option combinations
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-remote.txt15
1 files changed, 9 insertions, 6 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 37bd3e5..528f34a 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git remote' [-v | --verbose]
-'git remote add' [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror] <name> <url>
+'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 set-head' <name> (-a | -d | <branch>)
@@ -67,11 +67,14 @@ multiple branches without grabbing all branches.
With `-m <master>` option, `$GIT_DIR/remotes/<name>/HEAD` is set
up to point at remote's `<master>` branch. See also the set-head command.
+
-In mirror mode, enabled with `\--mirror`, the refs will not be stored
-in the 'refs/remotes/' namespace, but in 'refs/heads/'. This option
-only makes sense in bare repositories. If a remote uses mirror
-mode, furthermore, `git push` will always behave as if `\--mirror`
-was passed.
+When a fetch mirror is created with `\--mirror=fetch`, the refs will not
+be stored in the 'refs/remotes/' namespace, but rather everything in
+'refs/' on the remote will be directly mirrored into 'refs/' in the
+local repository. This option only makes sense in bare repositories,
+because a fetch would overwrite any local commits.
++
+When a push mirror is created with `\--mirror=push`, then `git push`
+will always behave as if `\--mirror` was passed.
'rename'::