From: Peter Baumann <waste.manager@gmx•de>
To: stoecher@gmx•at
Cc: git@vger•kernel.org
Subject: Re: parallel dev. with email
Date: Tue, 3 Mar 2009 20:35:33 +0100 [thread overview]
Message-ID: <20090303193533.GC9964@m62s10.vlinux.de> (raw)
In-Reply-To: <20090303153141.246620@gmx.net>
On Tue, Mar 03, 2009 at 04:31:41PM +0100, stoecher@gmx•at wrote:
> Hi,
>
> I am new to git and I am wondering what git commands to use for this szenario: two developers without the possibility of sharing a server communicate their changes via email.
>
> This is how far I have come reading the online docu:
> * Each developer can create the diff-info of his commits with
> git format-patch
> * and the other developer can incorporate these changes with
> git am
>
> After creating the patches with format-patch one could set a tag:
> git tag -f patchesDone
> so next time one wants to create patches, this tag can be used as the starting point:
> git format-patch patchesDone..
>
> But what if in the meantime one has incorporated the other developer's changes with git am? Then these changes will also be among the patches created with format-patch. What will happen, if these patches are sent to the other developer, who does not need his own changes again. Will his own changes be silently ignored by git am? Or how else to effectively coordinate the work of two developers with git via email?
>
> thank you,
>
> Wolfgang
[ Disclaimer: It was a *very* long time since I used this; there might
be a better way to use bundles already ]
You could also use 'git bundle' to send your changes. E.g. if you have
all your already released/send patches in master branch and all your
locale changes in private
$ git bundle create mybundle private ^master # not sure if private..master
# will work here
and your friend could to
$ git bundle verify mybundle
$ git fetch mybundle master:localRef
to import the changes. (Pls have a look in the manpage of git bundle,
there are many examples)
-Peter
prev parent reply other threads:[~2009-03-03 19:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-03 15:31 parallel dev. with email stoecher
2009-03-03 17:20 ` Marcel M. Cary
2009-03-03 19:35 ` Peter Baumann [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=20090303193533.GC9964@m62s10.vlinux.de \
--to=waste.manager@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=stoecher@gmx$(echo .)at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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