summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-03-30 19:53:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-30 20:47:54 (GMT)
commit099024861021830f9d4c7db4c64c844bf9d5ebd9 (patch)
tree68450eef9548d03599cb3e0a4d416a9965fa46f8 /Documentation
parenta9f5a3558dcf83440c60ae5a2e2b56c80d65bb0b (diff)
downloadgit-099024861021830f9d4c7db4c64c844bf9d5ebd9.zip
git-099024861021830f9d4c7db4c64c844bf9d5ebd9.tar.gz
git-099024861021830f9d4c7db4c64c844bf9d5ebd9.tar.bz2
remote: deprecate --mirror
The configuration created by plain --mirror is dangerous and useless, and we now have --mirror=fetch and --mirror=push to replace it. Let's warn the user. One alternative to this is to try to guess which type the user wants. In a non-bare repository, a fetch mirror doesn't make much sense, since it would overwrite local commits. But in a bare repository, you might use either type, or even both (e.g., if you are acting as an intermediate drop-point across two disconnected networks). So rather than try for complex heuristics, let's keep it simple. The user knows what they're trying to do, so let them tell us. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-remote.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 79e38fe..ddcbcc0 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -75,10 +75,6 @@ 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.
-+
-The option `\--mirror` (with no type) sets up both push and fetch
-mirror configuration. It is kept for historical purposes, and is
-probably not what you want.
'rename'::