Since release tags only happen on the master branch, running git describe on the develop branch yields:
fatal: No tags can describe 'afc0a77f45f380b077cedabcd16adeb8c5bbc401'.
Try --always, or create some tags.
To fix this, Instead of running git merge release/xxx on the develop branch, I run git merge master after the release branch has been merged in to master and deleted.
git merge release/xxx
git merge master
This allows me to run git describe on my develop branch and get:
Which is more useful during development if I want to package development releases for testing.
So the order is:
As you've stated yourself, this would be resolved by using #85.
Add short flag for backmerge and default to true
Add short flag `b` for `backmerge`.
Default `backmerge` flag to true (conforms to new branching model).
Fixes #49, #126