summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2022-09-20 03:21:08 -0400
committerPaul Smith <psmith@gnu.org>2022-09-20 13:23:44 -0400
commit990d6f9b9af1f6e3be8cc9c81959696d8f4a9aa9 (patch)
tree701e3c80dbcbccb9ecb45e3513ae8d6df0dca9ee
parent134480787ef13c18cf7dd283e963aba3c96bd170 (diff)
Release GNU make 4.3.904.3.90
* NEWS: Update for the prerelease. * bootstrap.conf: Choose the latest stable gnulib. * README.git: Updates.
-rw-r--r--NEWS4
-rw-r--r--README.git17
-rw-r--r--bootstrap.conf2
3 files changed, 13 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index 04cca2a7..b2e9dfca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
GNU make NEWS -*-indented-text-*-
History of user-visible changes.
- 20 January 2020
+ 20 September 2022
See the end of this file for copyrights and conditions.
@@ -9,7 +9,7 @@ which is contained in this distribution as the file doc/make.texi.
See the README file and the GNU make manual for instructions for
reporting bugs.
-Version 4.3.90 (20 Jan 2020)
+Version 4.3.90 (20 Sep 2022)
A complete list of bugs fixed in this version is available here:
diff --git a/README.git b/README.git
index 23d56eec..3fc39e07 100644
--- a/README.git
+++ b/README.git
@@ -46,7 +46,10 @@ added before it so be sure your comment lines are not longer than 72
characters; prefer 70 or less. Please use standard ChangeLog formats for
your commit messages (sans the leading TAB of course).
-Rule #1: Don't rewrite pushed history (don't use "git push --force").
+Rule #1: Don't rewrite pushed history on master (no "git push --force").
+Rule #2: Feel free to rewrite pushed history on personal branches.
+Rule #3: Prefer to squash-merge or rebase + merge --ff-only, rather than
+ merging from personal branches into master.
Typical simple workflow might be:
@@ -54,14 +57,14 @@ Typical simple workflow might be:
* Use "git status" and "git diff" to verify your changes
* Use "git add" to stage the changes you want to make
* Use "git commit" to commit the staged changes to your local repository
- * Use "git pull" to accept & merge new changes from the Savannah repository
- * Use "git push" to push your commits back to the Savannah repository
+ * Use "git pull -r" to accept new changes from the upstream repository
+ * Use "git push" to push your commits back to the upstream repository
For Emacs users, there are many options for Git integration but I strongly
-recommend the Magit package: https://www.emacswiki.org/emacs/Magit
-It makes the workflow much clearer, and has advanced features such as
-constructing multiple commits from various files and even from different
-diff chunks in the same file. There is a video available which helps a lot.
+recommend Magit: https://magit.vc/ It makes the workflow much clearer, and
+has advanced features such as constructing multiple commits from various files
+and even from different diff chunks in the same file. There is a video
+available which helps a lot.
Coding Standards
diff --git a/bootstrap.conf b/bootstrap.conf
index fd6e1a2c..b1ee947d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -19,7 +19,7 @@
checkout_only_file=README.git
# Choose a specific version of gnulib, when checking out
-GNULIB_REVISION=891934d4b75038abc8e82f52d7a74d357af7e7cc
+GNULIB_REVISION=stable-202207
# Always copy files rather than symlink
copy=true