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 bb914da1d8ad533fc5e0cf745a74b826660b8170..654b0aba854dbee9c4dee073738293eaecacfd16 100644
(file)
--- a/
scripts/rev_control/quick_git_release.sh
+++ b/
scripts/rev_control/quick_git_release.sh
@@
-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"
-