projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated version and minor improvement
[feisty_meow.git]
/
scripts
/
rev_control
/
quick_git_release.sh
diff --git
a/scripts/rev_control/quick_git_release.sh
b/scripts/rev_control/quick_git_release.sh
index e0c95a249faa4d9661c452d41387930dd8cf40a2..654b0aba854dbee9c4dee073738293eaecacfd16 100644
(file)
--- a/
scripts/rev_control/quick_git_release.sh
+++ b/
scripts/rev_control/quick_git_release.sh
@@
-68,7
+68,7
@@
read line
exit_on_error merging in the new release in master
# let the committer see the most recent changes.
echo "=> launching gitk to show you the full set of changes;"
exit_on_error merging in the new release in master
# let the committer see the most recent changes.
echo "=> launching gitk to show you the full set of changes;"
- echo "=> please prepare a
kick-ass
commit comment."
+ echo "=> please prepare a
n excellent
commit comment."
gitk
exit_on_error launching gitk
# now make a tag for the new release, which is where we should go crazy with the detailed
gitk
exit_on_error launching gitk
# now make a tag for the new release, which is where we should go crazy with the detailed
@@
-94,11
+94,16
@@
echo merging in from release branch to dev--hit enter
read line
git merge --no-ff $new_release
exit_on_error merging the release changes into the dev branch
read line
git merge --no-ff $new_release
exit_on_error merging the release changes into the dev branch
+echo pushing merged dev branch up
+ git push
+ exit_on_error pushing merged dev branch up
+
+ # done with the serious actions.
+ echo -e '\ncompleted the release of version $new_version\n'
+
# back to where we started.
popd
}
# back to where we started.
popd
}
-
make_new_feisty_meow_release "$1"
make_new_feisty_meow_release "$1"
-