Forgot "reply all"... ---------- Forwarded message ---------- From: Andrew Dennison <[email protected]> Date: Fri, Jul 3, 2009 at 1:42 PM Subject: Re: [Prex-devel] Very small bug found To: David Given <[email protected]>
On Fri, Jul 3, 2009 at 2:00 AM, David Given<[email protected]> wrote: > Andrew Dennison wrote: > [...] >> All these methods work. 3) is probably best if someone has questions >> about their changes - makes it easy to reply with inline comments in >> an email. > > Okay --- patch, hopefully, enclosed (courtesy of 'git format-patch'). > > It'll be nice to know if this works. I am working on my own branch, so > theoretically I suppose it ought to be possible to push the entire thing > off to someone else, but that involves more git-fu than I know right now. > > (I'm currently working on a H8300S port, so I want to get the process > figured out.) Sounds good. > If you check in the patch to master, and then I rebase my branch (your > instructions worked, BTW, although nothing seemed to have changed), then > will 'git show' stop seeing it as a change in my local branch? When you rebase patches that are already applied are droped from the branch. Patch came through fine. I've pushed up a branch called users/dg with your change. You should be able to run: $ git fetch origin to get the origin/users/dg branch to see all branches graphically: $ gitk --all & To generate a 'dg' branch that tracks users/dg do this: $ git checkout -b db origin/users/dg To rebase your 'local' branch on top of 'dg': $ git rebase dg local keep the local 'dg' branch clean. They you can get updates by doing this: $ git pull origin 'dg' will automatically track the users/dg branch at github. One suggestion to minimise pain as you learn git: rebase any changes you want to send me on top of 'dg' then generate patches - this maintains a linear history so you will not have to worry about merging branches. Andrew ------------------------------------------------------------------------------ _______________________________________________ Prex-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/prex-devel
