mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Discuss commit log messages on feature branches

Browse Source 
* admin/notes/git-workflow (Long-lived feature branches): New
section, discussing commit log messages on feature branches.
This commit is contained in:
Sean Whitton 2024-08-27 12:22:01 +08:00
parent 77302ccb6a
commit afee71273b
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/notes/git-workflow
View File

@ -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 commits requires separate merges, so don't be surprised to see more
than one merge commit. If you're happy, push. 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 Warnings about X11 forwarding
============================= =============================