CVS commit: ikiwiki

[Greg Troxel <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc.org
Committed By:   gdt
Date:           Sun Jan 14 13:07:51 UTC 2024

Modified Files:
        ikiwiki: wip.mdwn
        ikiwiki/wip: users.mdwn

Log Message:
wip: Expand commit message and git discussion

  - fix typo
  - warn about backwards merge commits
  - advise `git log -p -1` to review commits and to `--amend` if necessary
  - Rephrase commit messages in wip for Add/Update so that they are
    parallel to pkgsrc norms
  - Point out that wip updates for packages also in pkgsrc require
    adding upstream changes


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 ikiwiki/wip.mdwn
cvs rdiff -u -r1.20 -r1.21 ikiwiki/wip/users.mdwn

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.