{"thread":{"id":"6517","subject":"two-way sync; from firewalled host","startedAt":"2007-01-25T11:31:25Z","lastAt":"2007-02-03T09:14:47Z","messageCount":3,"participants":["Yakov Lerner","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"32599","messageId":"f36b08ee0701250331u10c6a608qcbbb3001a0481e@mail.gmail.com","threadId":"6517","inReplyTo":null,"subject":"two-way sync; from firewalled host","fromName":"Yakov Lerner","fromEmail":"iler.ml@gmail.com","sentAt":"2007-01-25T11:31:25Z","receivedAt":"2007-01-25T11:31:25Z","isPatch":false,"sender":{"key":"iler.ml@gmail.com","avatar":null},"body":"I have two hosts, host C which is firewalled (no sshd),\nand host S which has sshd and is not firewalled. Both have\nclone of the same repo, modified locally and differently on both hosts.\n\nI need to two-way sync them by running commands on C (the firewalled one).\n\nI need a script that does it, the \"git-sync\" script, running on C.\n              git-sync  user@host:path  [local-dir]   # synchronize\nlocal repo with\n                                                                   #\nremote repo via ssh\nIf there are no conflicts, I need to bring both repos to same state (even if\ntheir history will be different). If there are conflicts, I need to\nsynchronize everything\nthat is not in conflict, and report the list of conflicted files, and leave\nthe remote version as  './file.SUFFIX'  on host C, where script was invoked.\n\nThanks\nYakov\n"},{"id":"33199","messageId":"eprjep$dnm$1@sea.gmane.org","threadId":"6517","inReplyTo":"f36b08ee0701250331u10c6a608qcbbb3001a0481e@mail.gmail.com","subject":"Re: two-way sync; from firewalled host","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-02-01T02:33:16Z","receivedAt":"2007-02-01T02:33:16Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Yakov Lerner wrote:\n\n> I have two hosts, host C which is firewalled (no sshd),\n> and host S which has sshd and is not firewalled. Both have\n> clone of the same repo, modified locally and differently on both hosts.\n> \n> I need to two-way sync them by running commands on C (the firewalled one).\n\nYou can on host C pull from host S, and on host C push to host S.\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n"},{"id":"33438","messageId":"eq1jnj$rtv$2@sea.gmane.org","threadId":"6517","inReplyTo":"eprjep$dnm$1@sea.gmane.org","subject":"Re: two-way sync; from firewalled host","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-02-03T09:14:47Z","receivedAt":"2007-02-03T09:14:47Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"[Cc: git@vger.kernel.org]\n\nJakub Narebski wrote:\n\n> Yakov Lerner wrote:\n> \n>> I have two hosts, host C which is firewalled (no sshd),\n>> and host S which has sshd and is not firewalled. Both have\n>> clone of the same repo, modified locally and differently on both hosts.\n>> \n>> I need to two-way sync them by running commands on C (the firewalled one).\n> \n> You can on host C pull from host S, and on host C push to host S.\n\nSee post by Junio explaining how to setup this:\n    \n  Message-ID: <7vfy9ndiqp.fsf@assigned-by-dhcp.cox.net>\n  http://permalink.gmane.org/gmane.comp.version-control.git/38549\n\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n"}]}