Merge pull request #1027 from davvid/published-commit-config
commitfd38db29f34dcda89bbfec3e01025c4c13dd963d
authorDavid Aguilar <davvid@gmail.com>
Tue, 17 Dec 2019 20:11:27 +0000 (17 12:11 -0800)
committerDavid Aguilar <davvid@gmail.com>
Tue, 17 Dec 2019 20:11:27 +0000 (17 12:11 -0800)
tree659639a314445c437c4a5ec13231b202582d4467
parentc96a4b564fca1f281b930876fc48b8d391a0027f
parente8cb1dcd355900d8e95757550d4f0e87b309db8e
Merge pull request #1027 from davvid/published-commit-config

* davvid/published-commit-config:
  prefs: allow opting-out of the published commit check
  prefs: add docstrings
  prefs: rename CHECKCONFLICTS to CHECK_CONFLICTS
  prefs: alphabetize entries
  doc: add Jason to the credits

Signed-off-by: David Aguilar <davvid@gmail.com>