I just added rev b6cd03a to the emacs-24 branch (adding a file to .gitignore). The same issue needs to be fixed in master. What is the procedure to get the change from emacs-24 to master? Just cherry-pick the change? What about the Changelog? Is it expected to be merged in also? Or will there be a periodic bulk merge from emacs-24 to master?
Sorry, if this has been discussed before, but there are just too many emails to keep up with. :)
Thanks,
Christoph