On Jun 16, 2008, at 5:15 PM, Luke Kanies wrote: > That's basically what my workflow looks like. If I know what I'm > doing when I start (e.g., fixing bug #1232), I do this: > > $ git checkout 0.24.x > $ git checkout -b tickets/0.24.x/1232 > ... do work ... > ... run tests ... > $ git commit -a > $ git push luke tickets/0.24.x/1232 > $ git-format-patch -C -M -s -n 0.24.x..HEAD > $ git send-email --no-chain-reply-to --no-signed-off-by-cc -- > suppress-from --no-thread --to [email protected] 00*.patch > $ rm 00*
The only bits I forgot are what I do when the branch has been merged: $ git checkout 0.24.x $ # pull latest from James $ git pull # I've got 0.24.x set up as a tracking branch of James's branch $ # Delete my local branch $ git branch -d tickets/0.24.x/1232 $ # Delete the local branch $ git push luke :tickets/0.24.x/1232 Note that you should *always* use '-d' here (rather than '-D'), and I recommend always deleting the local branch first. 'git branch -d' will fail unless the branch you're deleting has been merged into the current branch, so it's an easy way to figure out whether it's safe to delete that branch. Note also the ':' in the push statement above -- that's what removes the remote branch. -- There are three kinds of death in this world. There's heart death, there's brain death, and there's being off the network. -- Guy Almes --------------------------------------------------------------------- Luke Kanies | http://reductivelabs.com | http://madstop.com --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
