From b4537860e1b46744cd58b1b36ca2ce55b36b24c5 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Fri, 11 Jul 2025 09:10:14 -0700 Subject: [PATCH 1/2] [skip ci] Small docs/release.rst update, mainly to warn about `git push --tags`. --- docs/release.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/release.rst b/docs/release.rst index 437b690301..bf00584333 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -50,7 +50,9 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use - Add a release branch if this is a new MINOR version, or update the existing release branch if it is a patch version - - New branch: ``git checkout -b vX.Y``, ``git push -u origin vX.Y`` + - NOTE: This documentation assumes your ``upstream`` is ``https://github.com/pybind/pybind11.git`` + + - New branch: ``git checkout -b vX.Y``, ``git push -u upstream vX.Y`` - Update branch: ``git checkout vX.Y``, ``git merge ``, ``git push`` @@ -63,7 +65,7 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use - Last-minute consistency check: same as tag? - - ``git push --tags`` + - Push the new tag: ``git push upstream vX.Y.Z`` (do NOT use ``git push --tags``!) - Update stable From ef59a04f34377593348b7046c1c44c815f0a9169 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Fri, 11 Jul 2025 13:23:00 -0700 Subject: [PATCH 2/2] Remove mention of `git push --tags` Co-authored-by: Henry Schreiner --- docs/release.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release.rst b/docs/release.rst index bf00584333..98b97d954a 100644 --- a/docs/release.rst +++ b/docs/release.rst @@ -65,7 +65,7 @@ If you don't have nox, you should either use ``pipx run nox`` instead, or use - Last-minute consistency check: same as tag? - - Push the new tag: ``git push upstream vX.Y.Z`` (do NOT use ``git push --tags``!) + - Push the new tag: ``git push upstream vX.Y.Z`` - Update stable