summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HACKING9
1 files changed, 6 insertions, 3 deletions
diff --git a/HACKING b/HACKING
index 0ff1eef27..d8ee634b1 100644
--- a/HACKING
+++ b/HACKING
@@ -131,9 +131,12 @@
merged even when they don't appear early in the list.
* 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.
+ 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. If a
+ topic branch is expected to be rewound, it is good practice to put
+ it in the 'experimental/*' namespace; for example, a rewindable branch
+ dealing with Vala support could be named like "experimental/vala-work".
============================================================================
= Writing a good commit message