aboutsummaryrefslogtreecommitdiff
path: root/SYNCING
Commit message (Collapse)AuthorAge
* Move NOTES->README, move Vim syntax file documentation to the file itself andNicholas Marriott2013-02-19
| | | | otherwise tweak some bits.
* Corrections to SYNCINGThomas Adam2013-01-30
| | | | | | | * Reflow some paragraphs due to repo-naming pushing the line length over 80 chaacters. * Correct path to git clone commands for each repo.
* Updated SYNCINGThomas Adam2013-01-17
|
* Don't push all tags when releasing tmuxThomas Adam2012-10-13
| | | | | | | | Pushing all tags with "git push --tags" will also transfer tags from the tmux-openbsd repository which isn't what we want to do! Therefore, just specify the newly created tag to push instead for the next release.
* Don't rely on "-s ours" for mergingThomas Adam2012-09-24
| | | | | | The ours strategy assumes one subsumes the other -- which isn't the case for the portable version, so for now -- just go back to using the default merge strategy of recursive, and fix-up any conflicts manually.
* Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmuxThomas Adam2012-09-20
|\ | | | | | | | | Conflicts: SYNCING
| * .+ SYNCING.Thomas Adam2012-09-19
| |
* | Add release instructions for new tmux versionsThomas Adam2012-09-20
|/ | | | | Document how actual releases will happen. Largely based on tcunha's original notes. Tweaked by me slightly to adapt to git.
* Add SYNCING documentThomas Adam2012-09-16
This explains how to keep the tmux and tmux-openbsd repositories in sync with one another during the course of tmux development.