Merge from savannah/emacs-30

e6c72aec9d7 ; Fix typos
9ffa38d3925 Eglot: fix completion highlighting (bug#72824)
d6880bc24dd ; * admin/make-tarball.txt: Document gotcha.
afee71273b7 Discuss commit log messages on feature branches
77302ccb6aa * admin/authors.el (authors-fixed-entries): Update docstr...
3a4839d1427 More consistent treesit-forward-sexp around comments (bug...
31293155879 Improve php-ts-mode font lock and support latest grammar ...
b8c05d73a11 Fix tree-sitter local parser overlay cleanup routine
aa6ed7f67ec Fix copyright years by hand (Bug#72809)

1 files changed, 14 insertions, 0 deletions

diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index d33f49a1aca..d873cac4269 100644
--- a/admin/notes/git-workflow
+++ b/admin/notes/git-workflow
@@ -138,6 +138,20 @@ When everything's done, look hard at the resulting merge.  Skipping
 commits requires separate merges, so don't be surprised to see more
 than one merge commit.  If you're happy, push.
 
+
+Long-lived feature branches
+===========================
+
+The conventions for formatting commit log messages set out in CONTRIBUTE
+don't apply to commits made to feature branches.
+Thus, feel free to commit little and often, with short and simple commit
+messages.  This practice can ease development by making 'git bisect' and
+'git revert' more effective.
+
+The commit merging the feature branch to master, on the other hand,
+should follow the usual commit log message conventions.
+
+
 Warnings about X11 forwarding
 =============================