]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ab/coc-update-to-2.0'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jan 2021 22:19:19 +0000 (14:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jan 2021 22:19:19 +0000 (14:19 -0800)
commit381dac23491ee3d80e00787449f0f1c70449419c
tree2dc85069271b99460948ce25aa2fb8aee329a1da
parent294e949fa2dfd43097b2b5614470a3e43604663d
parent0d28d3cf335ea36c8df26fff2722f204a637dc4d
Merge branch 'ab/coc-update-to-2.0'

Update the Code-of-conduct to version 2.0 from the upstream (we've
been using version 1.4).

* ab/coc-update-to-2.0:
  CoC: update to version 2.0 + local changes
  CoC: explicitly take any whitespace breakage
  CoC: Update word-wrapping to match upstream