Merge branch 'jc/doc-push-satellite' into maint
commitf07f4134ae44d7556509e246316482709d193f67
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2012 22:11:21 +0000 (7 14:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Dec 2012 22:11:21 +0000 (7 14:11 -0800)
tree8e36373784b74d9f8fca61b5a71315724e2829af
parentfff26a68053022a2cbc39142c7c6f6d016837058
parentb48990e7382a94bc6762ee7b88467d5d5a70fcb0
Merge branch 'jc/doc-push-satellite' into maint

* jc/doc-push-satellite:
  Documentation/git-push.txt: clarify the "push from satellite" workflow