From: "Peter Harris" <git@peter.is-a-geek.org>
To: "Luca Siciliano Viglieri" <lsiciliano@web.de>
Cc: git@vger.kernel.org
Subject: Re: Help merging two repo without connection
Date: Sun, 16 Nov 2008 10:33:54 -0500 [thread overview]
Message-ID: <eaa105840811160733s18be2705l60806b1bf40b1743@mail.gmail.com> (raw)
In-Reply-To: <AB681AEE-D229-4F1C-8D7B-8E60E0ED8E96@web.de>
On Sun, Nov 16, 2008 at 9:59 AM, Luca Siciliano Viglieri wrote:
> Hi,
> i'm trying to keep synched two repositories without always having a direct
> connection.
...
> I don't thinks its right to have double (or more?) commits. I would have
> expected something like:
>
>
> -- (first commit) -- (second commit) -- (my patch)--(my second patch) --
> (merge?) --
>
>
> The patches were created with git-format-patch and merged with git-am.
> I know that the commits have different sha1 but how can i keep with patches
> or something similar the two repositories exactly synched?
If you use "git bundle" instead of format-patch, you will have an
unreadable binary blob instead of a human-readable patch, but the
sha1s will not change (since the commiter information will be the
same). The remote side will "git pull" the bundle file instead of "git
am"ing it.
Peter Harris
prev parent reply other threads:[~2008-11-16 15:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-16 14:59 Help merging two repo without connection Luca Siciliano Viglieri
2008-11-16 15:06 ` Sverre Rabbelier
2008-11-16 15:33 ` Peter Harris [this message]
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=eaa105840811160733s18be2705l60806b1bf40b1743@mail.gmail.com \
--to=git@peter.is-a-geek.org \
--cc=git@vger.kernel.org \
--cc=lsiciliano@web.de \
/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).