diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-29 14:51:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-29 14:51:20 -0800 |
| commit | bccb0db855bb4db465fb23dca31962dee04a7cc5 (patch) | |
| tree | 5d789796685b7328c75400324b5e279ca8202732 /git-push.html | |
| parent | 3cd7ca3ec317055c48ccf2c379862b17f7c81838 (diff) | |
| download | git-htmldocs-bccb0db855bb4db465fb23dca31962dee04a7cc5.tar.gz | |
Autogenerated HTML docs for v1.8.0.1-347-gf94c3
Diffstat (limited to 'git-push.html')
| -rw-r--r-- | git-push.html | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/git-push.html b/git-push.html index f016c7e62..070e13d8b 100644 --- a/git-push.html +++ b/git-push.html @@ -1353,15 +1353,25 @@ the ones in the examples below) can be configured as the default for </p>
</dd>
<dt class="hdlist1">
-<tt>git push origin master:satellite/master dev:satellite/dev</tt>
+<tt>git push mothership master:satellite/master dev:satellite/dev</tt>
</dt>
<dd>
<p>
Use the source ref that matches <tt>master</tt> (e.g. <tt>refs/heads/master</tt>)
to update the ref that matches <tt>satellite/master</tt> (most probably
- <tt>refs/remotes/satellite/master</tt>) in the <tt>origin</tt> repository, then
+ <tt>refs/remotes/satellite/master</tt>) in the <tt>mothership</tt> repository;
do the same for <tt>dev</tt> and <tt>satellite/dev</tt>.
</p>
+<div class="paragraph"><p>This is to emulate <tt>git fetch</tt> run on the <tt>mothership</tt> using <tt>git
+push</tt> that is run in the opposite direction in order to integrate
+the work done on <tt>satellite</tt>, and is often necessary when you can
+only make connection in one way (i.e. satellite can ssh into
+mothership but mothership cannot initiate connection to satellite
+because the latter is behind a firewall or does not run sshd).</p></div>
+<div class="paragraph"><p>After running this <tt>git push</tt> on the <tt>satellite</tt> machine, you would
+ssh into the <tt>mothership</tt> and run <tt>git merge</tt> there to complete the
+emulation of <tt>git pull</tt> that were run on <tt>mothership</tt> to pull changes
+made on <tt>satellite</tt>.</p></div>
</dd>
<dt class="hdlist1">
<tt>git push origin HEAD:master</tt>
@@ -1431,7 +1441,7 @@ a <tt>git gc</tt> command on the origin repository.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-11-27 13:53:10 PDT
+Last updated 2012-11-29 14:50:58 PDT
</div>
</div>
</body>
|