Thomas Adam
fab8ca0737
SYNCING: Make a note about libutils
...
Don't forget that compat/* needs updating periodically as well.
2014-08-09 20:32:09 +01:00
Nicholas Marriott
3108d80b7e
Move NOTES->README, move Vim syntax file documentation to the file itself and
...
otherwise tweak some bits.
2013-02-19 23:31:04 +00:00
Thomas Adam
6e6d756109
Corrections to SYNCING
...
* Reflow some paragraphs due to repo-naming pushing the line length over 80
chaacters.
* Correct path to git clone commands for each repo.
2013-01-30 23:28:38 +00:00
Thomas Adam
b237d9dd95
Updated SYNCING
2013-01-17 02:02:04 +00:00
Thomas Adam
bf45619441
Don't push all tags when releasing tmux
...
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.
2012-10-13 13:35:35 +01:00
Thomas Adam
253f1395a0
Don't rely on "-s ours" for merging
...
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.
2012-09-24 18:05:34 +01:00
Thomas Adam
dc3df931d7
Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux
...
Conflicts:
SYNCING
2012-09-20 23:02:49 +01:00
Thomas Adam
d3d48fa3e7
Add release instructions for new tmux versions
...
Document how actual releases will happen. Largely based on tcunha's
original notes. Tweaked by me slightly to adapt to git.
2012-09-20 22:59:08 +01:00
Thomas Adam
73f29094d0
.+ SYNCING.
2012-09-19 09:50:39 +01:00
Thomas Adam
a043b975ca
Add SYNCING document
...
This explains how to keep the tmux and tmux-openbsd repositories in sync
with one another during the course of tmux development.
2012-09-16 22:53:58 +01:00
