[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-30 afee71273b7 2/2: Discuss commit log messages on feature branche
From: |
Sean Whitton |
Subject: |
emacs-30 afee71273b7 2/2: Discuss commit log messages on feature branches |
Date: |
Tue, 27 Aug 2024 00:22:34 -0400 (EDT) |
branch: emacs-30
commit afee71273b7041377148fbcfb554db5b45bcb3c9
Author: Sean Whitton <spwhitton@spwhitton.name>
Commit: Sean Whitton <spwhitton@spwhitton.name>
Discuss commit log messages on feature branches
* admin/notes/git-workflow (Long-lived feature branches): New
section, discussing commit log messages on feature branches.
---
admin/notes/git-workflow | 14 ++++++++++++++
1 file changed, 14 insertions(+)
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
=============================