-
Notifications
You must be signed in to change notification settings - Fork 0
How to use branches
A change, committed to one branch, often ends up in several places. The branch names are denoted by [name].
These are the following types of changes, and how they should be commited to the repository.
This is a bug-fix that isn't dependent on any of the features.
- Commit to: [feature/bug-fixes]
- Merge into: [neomutt]
- Backport to 1.5.24? If important (and possible).
- Commit to: [feature5/bug-fixes]
- Merge into: [neomutt5]
A commit to an old feature. These features existed before Mutt 1.6.0 was released: cond-date, fmemopen, ifdef, index-color, initials, limit-current-thread, nested-if, notmuch, progress, quasi-delete, sidebar, skip-quoted, status-color, tls-sni, trash.
- Commit to: [feature/{NAME}]
- Merge into: [neomutt]
- Backport to 1.5.24? If possible.
- Commit to: [feature5/{NAME}]
- Merge into: [neomutt5]
A commit to a new feature. These features were introduced after Mutt-1.6.0 was released: compress, keywords, lmdb, nntp.
- Commit to: [feature/{NAME}]
- Merge into: [neomutt]
- Backport to 1.5.24? No.
A commit to NeoMutt, e.g. a change to the README.
- Commit to: [neomutt]
- Backport to 1.5.24? If important (and possible).
- Commit to: [neomutt5]
A new stable version of Mutt has been released. This must be merged into all the feature branches.
- Commit to: [mutt/stable]
- Merge into: [feature/{ALL}]
- Merge all features into: [neomutt]
New changes have been committed to the Mutt development branch. Most changes are ignored, for now. However there are some changes to the sidebar that we should adopt.
- Commit to: [mutt/default]
- Update Sidebar? If important (and possible).
- Commit to: [feature/sidebar]
- Merge into: [neomutt]
- Backport to 1.5.24? Unlikely, but possible
- Commit to: [feature5/sidebar]
- Merge into: [neomutt5]
Updates to NeoMutt features under development.
- Commit to: [devel/{NAME}]
- No action required