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 8480f7c7b79468b1429a7e70f48d9e12123ccb8d..62af1ecf0c3ab25356a7b8e769b7e54bdc6e0316 100644 (file)
--- 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