git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Yakov Lerner" <iler.ml@gmail.com>
To: "Git Mailing List" <git@vger.kernel.org>
Subject: two-way sync; from firewalled host
Date: Thu, 25 Jan 2007 13:31:25 +0200	[thread overview]
Message-ID: <f36b08ee0701250331u10c6a608qcbbb3001a0481e@mail.gmail.com> (raw)

I have two hosts, host C which is firewalled (no sshd),
and host S which has sshd and is not firewalled. Both have
clone of the same repo, modified locally and differently on both hosts.

I need to two-way sync them by running commands on C (the firewalled one).

I need a script that does it, the "git-sync" script, running on C.
              git-sync  user@host:path  [local-dir]   # synchronize
local repo with
                                                                   #
remote repo via ssh
If there are no conflicts, I need to bring both repos to same state (even if
their history will be different). If there are conflicts, I need to
synchronize everything
that is not in conflict, and report the list of conflicted files, and leave
the remote version as  './file.SUFFIX'  on host C, where script was invoked.

Thanks
Yakov

             reply	other threads:[~2007-01-25 11:31 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-25 11:31 Yakov Lerner [this message]
2007-02-01  2:33 ` two-way sync; from firewalled host Jakub Narebski
2007-02-03  9:14   ` Jakub Narebski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f36b08ee0701250331u10c6a608qcbbb3001a0481e@mail.gmail.com \
    --to=iler.ml@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).