HACKING: fixlets about git branch rewinding policy

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/HACKING b/HACKING
index 45f9370..0ff1eef 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -130,11 +130,10 @@
   a later 'git log' gives an indication of which actual patches were
   merged even when they don't appear early in the list.
 
-* master and release branches should not be rewound, i.e., should always
-  fast-forward, except maybe for privacy issues.  The maint branch should not
-  be rewound except maybe after retiring a release branch or a new stable
-  release.  For next, and for feature branches, the announcement for the
-  branch should document rewinding policy.
+* The 'master' and 'maint' branches should not be rewound, i.e., should
+  always fast-forward, except maybe for privacy issues.  For 'next' (if
+  that will ever be implemented), and for feature branches, the announcement
+  for the branch should document rewinding policy.
 
 ============================================================================
 = Writing a good commit message