aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-09-16 16:35:40 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-09-16 16:35:40 -0300
commit7de358ac80afaf90b83f811a43c8aea3831f41cd (patch)
treee2b07dcd17a06b7bd8cace9d62e6a5bb192b8207
parentaa3dbea39ef0a99bc678dae781457b7f77a73ea2 (diff)
downloadkeyringer-7de358ac80afaf90b83f811a43c8aea3831f41cd.tar.gz
keyringer-7de358ac80afaf90b83f811a43c8aea3831f41cd.tar.bz2
Development: merge upstream on debian
-rw-r--r--development.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/development.mdwn b/development.mdwn
index 96bd234..2fa2060 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -36,9 +36,9 @@ Commit and tag a release:
git commit -a -m "Keyringer VERSION"
git tag -s
git checkout upstream
- git merge master
+ git merge master
git checkout debian
- git merge master
+ git merge upstream
git push --all --tags
Create a release file: