diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2010-07-21 05:53:45 +0200 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2010-07-21 05:53:45 +0200 |
| commit | c3740a936b0039ffeaf7cddad80957c3a8d782bf (patch) | |
| tree | 9f80adc532f19d4e8e34f9a74421524383ac0d13 | |
| parent | 1f6a1c0cba786abeed0446b4336d5eac85390543 (diff) | |
| download | org-mode-c3740a936b0039ffeaf7cddad80957c3a8d782bf.tar.gz | |
Make release process get the tag from maint into master
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -297,6 +297,7 @@ release: make pushreleasetag TAG=$(TAG) git push origin maint git checkout master + git merge -s ours maint UTILITIES/set-version.pl -o $(TAG) git commit -a -m "Update website to show $(TAG) as current release" git push |