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.txt | |
parent | 3cd7ca3ec317055c48ccf2c379862b17f7c81838 (diff) | |
download | git-htmldocs-bccb0db855bb4db465fb23dca31962dee04a7cc5.tar.gz |
Autogenerated HTML docs for v1.8.0.1-347-gf94c3
Diffstat (limited to 'git-push.txt')
-rw-r--r-- | git-push.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/git-push.txt b/git-push.txt index 6d19d59ce..8b637d339 100644 --- a/git-push.txt +++ b/git-push.txt @@ -385,11 +385,23 @@ the ones in the examples below) can be configured as the default for A handy way to push the current branch to the same name on the remote. -`git push origin master:satellite/master dev:satellite/dev`:: +`git push mothership master:satellite/master dev:satellite/dev`:: Use the source ref that matches `master` (e.g. `refs/heads/master`) to update the ref that matches `satellite/master` (most probably - `refs/remotes/satellite/master`) in the `origin` repository, then + `refs/remotes/satellite/master`) in the `mothership` repository; do the same for `dev` and `satellite/dev`. ++ +This is to emulate `git fetch` run on the `mothership` using `git +push` that is run in the opposite direction in order to integrate +the work done on `satellite`, 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). ++ +After running this `git push` on the `satellite` machine, you would +ssh into the `mothership` and run `git merge` there to complete the +emulation of `git pull` that were run on `mothership` to pull changes +made on `satellite`. `git push origin HEAD:master`:: Push the current branch to the remote ref matching `master` in the |