On Thu, 2008-04-10 at 18:13 +1000, Erik de Castro Lopo wrote: > > a) Pull the upstreams sources (this I can already do). > > b) Create branch of the upstream sources for my own hacking (I > think this is "git clone upstream hacking"). Yes. > c) Hack on my hacking branch and commit stuff as I see fit. > > d) Routinely update my upstream source branch (this I can do with > "git fetch ; git rebase origin" but I'm not entirely sure what > these commands do). fetch will update the upstream., The rebase command rewrites your revision history by (roughly) applying the commits you had as patches to the new tip of upstream, and committing them serially; of course this breaks collaboration with you for other repositories; or even with yourself if you have a laptop and desktop environment that you don't keep in firm sync. > e) Merge from the updated upstream into my hacking branch. d has done that. > f) Generate diffs between the upstream branch to my hacking branch > to send upstream. I think its patchbomb for this; but I'm not a git afficiondo :) > It would be much appreciated if someone could clue me in on this > stuff. For instance, I'm not sure the above is even the right way > to work with git. I have found dozens of supposed explanations and > howtos on the net and none of then are anywhere near a complete > picture. many of them are not even helpful. -Rob -- GPG key available at: <http://www.robertcollins.net/keys.txt>.
Description: This is a digitally signed message part