summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-11-09 10:31:32 -0200
committerSilvio Rhatto <rhatto@riseup.net>2016-11-09 10:31:32 -0200
commitd57c2b7070f148c1bdccdce2527a7ec0bf33278f (patch)
tree3e9d91eb52d1d810e51339f8d734178aded22672
parent155a801258993371e1de5541407d7606fa8a3354 (diff)
downloadkeyringer-d57c2b7070f148c1bdccdce2527a7ec0bf33278f.tar.gz
keyringer-d57c2b7070f148c1bdccdce2527a7ec0bf33278f.tar.bz2
Updates develop docs
-rw-r--r--development.mdwn4
1 files changed, 4 insertions, 0 deletions
diff --git a/development.mdwn b/development.mdwn
index 627c2f1..3287bb2 100644
--- a/development.mdwn
+++ b/development.mdwn
@@ -50,6 +50,10 @@ Run lintian (or [add it to your pbuilder hooks](http://askubuntu.com/questions/1
lintian --info --display-info --pedantic --color auto \
../build-area/keyringer_$VERSION*.changes
+Then go back to the develop branch:
+
+ git checkout develop
+
Notes:
* `git-import-orig` takes care of running `pristine-tar commit`, of merging of the tag and orig tarball into the upstream branch, and then it merges the result into the debian branch. With the above configuration, it also runs git-dch to do the bulk of the work in `debian/changelog`.