From c70c8b607f84611373969d3add2f6ef25e61078f Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 11 Jan 2019 01:20:15 +0100
Subject: doc [ci skip] #9478
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Lua
- developer guidelines
- MAINTAIN.md
- TUI: cleanup
- TUI: mention Windows terminfo builtins
- cleanup if_pyth, redirect python-bindeval tag

Helped-by: Björn Linse <bjorn.linse@gmail.com>
Helped-by: erw7 <erw7.github@gmail.com>
---
 scripts/release.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/release.sh b/scripts/release.sh
index fb266ad154..a51a6666f5 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -93,7 +93,7 @@ Next steps:
     - Double-check NVIM_VERSION_* in CMakeLists.txt
     - Push the tag:
         git push --follow-tags
-    - Empty-merge (if this is a maintenance release):
-        git checkout upstream/master
-        git merge -s ours upstream/release-x.y
+    - Update the 'stable' tag:
+        git push --force upstream HEAD^:refs/tags/stable
+        git fetch --tags
     - Update website: index.html"
-- 
cgit