Bastien <b...@altern.org> wrote: > > is there a process for bug-fix commits like this one which should be > > pushed through to Emacs24? I'm thinking a branch (maintenance?) to > > which this should be pushed or a special way to tag the commit? > > there is none for now -- I need to think about it. > > As I will need a few hours more to create the ChangeLog between 7.5 > and 7.6 for Emacs (yeah!), I plan to make a minor release 7.6.1 that > will be the one we'll have in Emacs. Probably tomorrow morning or > sunday morning. > > So this fix will go thru Emacs, then we can think about a better > process. Detailed suggestions from git power users welcome! >
I'm not sure whether I posted this before but if you haven't seen it before, it's probably worth reading: http://nvie.com/posts/a-successful-git-branching-model/ There is a set of tools that supports this kind of workflow at https://github.com/nvie/gitflow Nick
