Merge branch 'jk/maint-remote-mirror-safer'
commitcea667e955cca71e517f259c86bf974d03064df2
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2011 17:38:14 +0000 (6 10:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2011 17:38:14 +0000 (6 10:38 -0700)
tree372f6751be6b5cfbc8cd9a944918612afcfca173
parent7e3ead13e526f67d528e3eea50b1441bdccb62f8
parent099024861021830f9d4c7db4c64c844bf9d5ebd9
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
Documentation/git-remote.txt
builtin/remote.c