diff options
| author | Paul Eggert | 2014-11-04 09:46:49 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-11-04 09:46:49 -0800 |
| commit | a9f1618de84c72516aae1c4d054d44d2b36750d2 (patch) | |
| tree | efa237f59581b0a6fb45e8da711a606f5e6b85f7 /admin/notes | |
| parent | f3e25d69b0fc9e3a594e2087b30f610514db39b1 (diff) | |
| download | emacs-a9f1618de84c72516aae1c4d054d44d2b36750d2.tar.gz emacs-a9f1618de84c72516aae1c4d054d44d2b36750d2.zip | |
Spelling fixes; tweak explanation of commit messages.
* admin/notes/repo: Avoid "DVCS" acronym without first explaining it.
Mention using the first line of a ChangeLog as the topic line, and
that commit messages should use UTF-8.
* lisp/mouse.el (mouse-drag-line): Fix misspelling of "right-fringe".
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/repo | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/admin/notes/repo b/admin/notes/repo index 276dd372b37..601c41062fd 100644 --- a/admin/notes/repo +++ b/admin/notes/repo | |||
| @@ -1,19 +1,22 @@ | |||
| 1 | NOTES ON COMMITTING TO EMACS'S REPOSITORY -*- outline -*- | 1 | NOTES ON COMMITTING TO EMACS'S REPOSITORY -*- outline -*- |
| 2 | 2 | ||
| 3 | * Use DVCS commenting conventions | 3 | * Use conventions in commit messages |
| 4 | 4 | ||
| 5 | Commits should follow the conventions used in all modern distributed | 5 | Commit messages should follow conventions used in modern distributed |
| 6 | version-control systems. That is, they should consist of | 6 | version control systems. |
| 7 | 7 | ||
| 8 | - A self-contained topic line, preferably no more than 75 chars long. | 8 | - Start with a self-contained topic line, preferably no longer than 75 chars. |
| 9 | 9 | ||
| 10 | - If other content follows the topic line, there should be a blank | 10 | - Make the second line blank, if there are two or more lines. |
| 11 | line separating the two. | ||
| 12 | 11 | ||
| 13 | - Follow the blank line with ChangeLog-like entries for the specific | 12 | - Follow the blank line with ChangeLog-like entries for the specific |
| 14 | changes you made, if any. (As long as Emacs maintains ChangeLog | 13 | changes you made, if any. As long as Emacs maintains ChangeLog |
| 15 | files, just copy the entries you made in them to the commit message | 14 | files, just copy the entries you made in them to the commit message |
| 16 | after the blank line.) | 15 | after the blank line. Often, the first line of a ChangeLog entry |
| 16 | can serve as the topic line, so you can merely insert a blank line | ||
| 17 | after it. | ||
| 18 | |||
| 19 | - Use UTF-8 encoding in the commit message. | ||
| 17 | 20 | ||
| 18 | * Commit to the right branch | 21 | * Commit to the right branch |
| 19 | 22 | ||