Skip to content

satosa core development guidelines

Gijutsu edited this page Apr 3, 2017 · 1 revision

How to commit and merge PR:s

  1. Never commit directly to master.
  2. Make a pull request and let someone else in satosa-core review and merge it.
  3. Commits made by the satosa-core team in the main SATOSA repository should be signed.
  4. When merging pull requests make a signed commit using your Yubikey with --no-ff, or change you .gitconfig to e.g.:
[user]
    email = john@sunet.se
    name = John Van de Meulebrouck Brendgard
    signingkey = 807A5FD4B3337B77

[pull]
    ff = yes

[merge]
    gpgsign = true
    ff = no

[commit]
    gpgsign = true