From 7de358ac80afaf90b83f811a43c8aea3831f41cd Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Mon, 16 Sep 2013 16:35:40 -0300 Subject: Development: merge upstream on debian --- development.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'development.mdwn') 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: -- cgit v1.2.3