Merge branch 'jk/maint-remote-mirror-safer' into next
commitccc9c1ae9a378cca3d0cc3da7d57c9fd7b77cb07
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 20:55:37 +0000 (3 13:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Apr 2011 20:55:37 +0000 (3 13:55 -0700)
treea00eb7e5653b965768023b01a2552bc39f88e684
parentbc85b80cd7ba90376be3e21b571477b0b2368ccb
parent099024861021830f9d4c7db4c64c844bf9d5ebd9
Merge branch 'jk/maint-remote-mirror-safer' into next

* 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