diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-10 23:10:58 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-01-10 23:18:10 +0100 |
commit | ca307a408e036aab9eaf086cc2792929419ede1b (patch) | |
tree | 2f176e45fa77059930e3b56c2cae8ab95da01670 /HACKING | |
parent | 801cbef2d8a49af4c2e6f5a23b641170d0a1136b (diff) | |
download | automake-ca307a408e036aab9eaf086cc2792929419ede1b.tar.gz |
HACKING: fixlets about git branch rewinding policy
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'HACKING')
-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 |