From: Stefano Lattarini Date: Wed, 18 Aug 2010 22:04:34 +0000 (+0200) Subject: HACKING: improve description of git "bugfix branches". X-Git-Tag: v1.11.1b~57^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2ff7e81110e29c37fdbb8938407c25049e46813;p=thirdparty%2Fautomake.git HACKING: improve description of git "bugfix branches". * HACKING (Working with git): Extend the description of git "bugfix branches". --- diff --git a/HACKING b/HACKING index 8480f7c7b..62af1ecf0 100644 --- a/HACKING +++ b/HACKING @@ -139,9 +139,11 @@ # if all seems ok, then actually push: git push origin maint branch-1.11 master -* For bug fixes of long-standing bugs, it may be useful to commit them to - a new branch based off of the commit that introduced the bug, and merge - this bugfix branch into active branches that descend from the buggy commit. +* When fixing a bug (especially a long-standing one), it may be useful + to commit the fix to a new temporary branch based off the commit that + introduced the bug. Then this "bugfix branch" can be merged into all + the active branches descending from the buggy commit. This offers a + simple way to fix the bug consistently and effectively. * There may be a number of longer-lived feature branches for new developments. They should be based off of a common ancestor of all active branches to