Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/HuasoFoundries/phpPgAdmin6.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c5ef736e..2ef600e7 100644
--- a/Makefile
+++ b/Makefile
@@ -44,11 +44,13 @@ mocktag:
tag_and_push:
- @if [[ "$(CURRENT_BRANCH)" != "master" ]]; then \
+ @git commit -a -m "Creating Tag v$(v) at $(DATENOW) - $(m)" ;\
+
+ if [[ "$(CURRENT_BRANCH)" != "master" ]]; then \
git checkout master ;\
git merge $(CURRENT_BRANCH) ;\
fi
- @git commit -a -m "Creating Tag v$(v) at $(DATENOW) - $(m)" ;\
+
git tag v$(v) ;\
git push ;\
git push --tags ;\