From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 16 Sep 2013 19:35:40 +0000 (-0300)
Subject: Development: merge upstream on debian
X-Git-Tag: 0.2.3~13
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7de358ac80afaf90b83f811a43c8aea3831f41cd;p=keyringer.git

Development: merge upstream on debian
---

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: