Andrew's git / gitweb.git / diff
?
Merge branch 'jk/maint-remote-mirror-safer'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2011 17:38:14 +0000 (10:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2011 17:38:14 +0000 (10:38 -0700)
* jk/maint-remote-mirror-safer:
remote: deprecate --mirror
remote: separate the concept of push and fetch mirrors
remote: disallow some nonsensical option combinations

1  2 
Documentation/git-remote.txt patch | diff1 | diff2 | blob | history
builtin/remote.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/git-remote.txt
Simple merge
diff --cc builtin/remote.c
Simple merge