diff options
-rw-r--r-- | HACKING | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -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 |