diff options
author | Jeff King <peff@peff.net> | 2011-03-30 15:53:39 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-30 13:47:54 -0700 |
commit | 099024861021830f9d4c7db4c64c844bf9d5ebd9 (patch) | |
tree | 68450eef9548d03599cb3e0a4d416a9965fa46f8 /git-gui/lib/mergetool.tcl | |
parent | remote: separate the concept of push and fetch mirrors (diff) | |
download | tgif-099024861021830f9d4c7db4c64c844bf9d5ebd9.tar.xz |
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 'git-gui/lib/mergetool.tcl')
0 files changed, 0 insertions, 0 deletions