I'm totally in love with git, and I think you should be too. I think it's particularly useful for non-comitters, since it allows local commits and branches which should make tracking trunk easier. git format-patch makes getting your changes into a jira-able format a doodle.
Here's how I'd use git to do this: git clone git://jukka.zitting.name/qpid.git qpid [1] git checkout -b QPID-2342 [I name branches for the jira, easier to remember what goes with what] [... hack hack hack ...] git commit [... time passes ...] git checkout master git pull origin git checkout QPID-2342 git rebase master [... fix up conflicts, make further changes etc ...] git commit git rebase -i HEAD~2 [lets you merge fix ups back into the main revision again, totally sweet] mkdir -p ~/src/patches/QPID-2342/ git format-patch master -o ~/src/patches/QPID-2342/ then attach the patches to the Jira using your favourite webbrowser. - Aidan [1] Also available at http://jukka.zitting.name/git/r/qpid.git if git:// doesn't work for you -- Apache Qpid - World Domination through Advanced Message Queueing http://qpid.apache.org --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:dev-subscr...@qpid.apache.org
