On Fri, Jun 13, 2008 at 04:33:34PM +0200, Mirko Stocker <mirko.stocker@xxxxxx> wrote: > 3) Then we have the role of a "Merge-Dude" who pulls the changes from > /git-proj and uses 'git merge origin/origin' to update his master. > If there are any conflicts, he resolves them and pushes everything > back to the master at /git-proj. > > 4) The users can just push and pull from /git-proj. > > From time to time, we can use 'git diff origin/origin' to get a patch > with all the changes we made and have to send upstream. > > What do you guys think, is this approach feasible? > > What I don't like is how we have to make the upstream patch(es). Is > there an easy way we can get multiple patches, lets say for each > commit we made? Or is it easier to make a lots of branches and to > then create a patch from the diff between the branch and origin/origin? Don't you mean origin/master? In general, if you don't merge your changes but you rebase on top of the new upstream head, then you can use 'git format-patch origin/master..' to create patches for each commit. It'll include the commit message and each commit will be written out as a separate file.
Attachment:
pgpERa3hH9fn1.pgp
Description: PGP signature
