From 21f17656aca5bdf8ce02e768b9512c29e939846d Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 5 Feb 2025 13:09:50 -0500 Subject: Help/dev: Update git command-line conventions in maintainer guide Replace `git checkout` with `git switch` and `git restore`. --- Help/dev/maint.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst index 2f4babc..24ddb9a 100644 --- a/Help/dev/maint.rst +++ b/Help/dev/maint.rst @@ -78,7 +78,7 @@ Before merging a ``$topic`` branch into ``release``, verify that the .. code-block:: shell git fetch origin - git checkout -b release-$ver origin/release + git switch -c release-$ver origin/release Merge the ``$topic`` branch into the local ``release-$ver`` branch, making sure to include a ``Merge-request: !xxxx`` footer in the commit message: @@ -91,7 +91,7 @@ Merge the ``release-$ver`` branch to ``master``: .. code-block:: shell - git checkout master + git switch master git pull git merge --no-ff release-$ver @@ -180,7 +180,7 @@ use for consolidating the release notes: .. code-block:: shell - git checkout -b doc-$ver-relnotes + git switch -c doc-$ver-relnotes Run the `consolidate-relnotes.bash`_ script: @@ -236,7 +236,7 @@ branch locally: .. code-block:: shell - git checkout -b release-$ver origin/master + git switch -c release-$ver origin/master Remove the development branch release note infrastructure: @@ -278,7 +278,7 @@ Merge the ``release-$ver`` branch to ``master``: .. code-block:: shell - git checkout master + git switch master git pull git merge --no-ff release-$ver @@ -287,7 +287,7 @@ note infrastructure, and the version date from ``origin/master``: .. code-block:: shell - git checkout origin/master -- \ + git restore -s origin/master -- \ Source/CMakeVersion.cmake Help/release/dev/0-sample-topic.rst sed -i $'/^Releases/ i\\\n.. include:: dev.txt\\\n' Help/release/index.rst -- cgit v0.12