On 5/28/08, Andrew Arnott <andrewarnott@xxxxxxxxx> wrote: > At some point, most or all the commits on master since branching off > v1.0 I want to include in the v1.1 release. I think this is perhaps the root of your problem. Normally people don't merge from master into their bugfix release; they do it the other way around, making bugfixes in the bugfix branch, and merging them occasionally into master. Or alternatively, they cherry pick just *some* of the changes from master back into the bugfix release, because presumably there are also a bunch of non-critical new feature patches sitting in master. If you really want to do it the way you described, an easy answer might be to just merge the entire master into v1.1, then "git revert" (in v1.1) the patch that changes the version number :) Have fun, Avery -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
