diff options
Diffstat (limited to 'development.mdwn')
| -rw-r--r-- | development.mdwn | 4 |
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: |