From 0fc1ef2d08d9c4c12f9cf7bbb37ab537f4295e80 Mon Sep 17 00:00:00 2001 From: Stefan Sperling Date: Fri, 29 Sep 2023 13:45:02 +0000 Subject: [PATCH] suggest a better strategy to deal with nsh-version.mk modifications --- nsh-version.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nsh-version.mk b/nsh-version.mk index 2b22dee..96124f0 100644 --- a/nsh-version.mk +++ b/nsh-version.mk @@ -44,9 +44,10 @@ # Before running 'make release' again, ensure your work tree is clean. # In any case, remove botched generated tarballs and new dist-list files: # rm nsh-1.x.tar.gz nsh-dist.txt.new -# If an error left behind any nsh-version.mk modifications, revert them: -# With Git: git restore nsh-version.mk -# With Got: got revert nsh-version.mk +# If an error left behind any nsh-version.mk modifications, revert them, +# keeping the version number bump intact: +# With Git: git restore -p nsh-version.mk +# With Got: got revert -p nsh-version.mk # # 4) Copy nsh-1.x.tar.gz to /usr/ports/distfiles and update the # nsh port in /usr/ports/shells/nsh to the new release.