ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use -f to push maint

This commit is contained in:
Carsten Dominik 2010-10-29 06:02:15 +02:00
parent 110b4c4610
commit 750fdcfc9b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -311,7 +311,7 @@ release:
rm org-$(TAG)*.zip rm org-$(TAG)*.zip
rm org-$(TAG)*.tar.gz rm org-$(TAG)*.tar.gz
make pushreleasetag TAG=$(TAG) make pushreleasetag TAG=$(TAG)
git push origin maint git push -f origin maint
git checkout master git checkout master
git merge -s ours maint git merge -s ours maint
UTILITIES/set-version.pl -o $(TAG) UTILITIES/set-version.pl -o $(TAG)
@ -340,7 +340,7 @@ fixrelease:
rm org-$(TAG)*.zip rm org-$(TAG)*.zip
rm org-$(TAG)*.tar.gz rm org-$(TAG)*.tar.gz
make pushreleasetag TAG=$(TAG) make pushreleasetag TAG=$(TAG)
git push origin maint git push -f origin maint
git checkout master git checkout master
git merge -s ours maint git merge -s ours maint
UTILITIES/set-version.pl -o $(TAG) UTILITIES/set-version.pl -o $(TAG)