diff options
| author | Didier Raboud <odyx@debian.org> | 2013-03-25 08:03:33 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2013-03-25 08:08:25 +0100 |
| commit | 10fc342e14515b29a57572756f23aa553acc4bd9 (patch) | |
| tree | 1f608c59fcfffba2af7e0ece34bd85c325df56e3 | |
| parent | df1ec63f2e6607c407f2600b2c9ace6a835e82a7 (diff) | |
| download | colobot-10fc342e14515b29a57572756f23aa553acc4bd9.tar.gz colobot-10fc342e14515b29a57572756f23aa553acc4bd9.tar.bz2 colobot-10fc342e14515b29a57572756f23aa553acc4bd9.zip | |
Add convenience merger
| -rwxr-xr-x | debian/rules | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/debian/rules b/debian/rules index 171cbb8..bc96db7 100755 --- a/debian/rules +++ b/debian/rules @@ -14,3 +14,11 @@ override_dh_auto_configure: override_dh_auto_build: dh_auto_build -a dh_auto_build -i -- doc + +merge-dev: + set -e; \ + DEV_COMMIT=$$(git describe --tags dev | sed -e 's/^colobot-gold-pre_alpha-//g'); \ + git merge --no-commit dev; \ + dch -b -v 0.1.0~pre-alpha-git-dev~r$${DEV_COMMIT}-1~OdyX0 "New snapshot of dev branch ($${DEV_COMMIT})"; \ + git add debian/changelog; \ + git commit -m "Merge snapshot of dev branch ($${DEV_COMMIT})" |