From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jan 2021 22:19:19 +0000 (-0800)
Subject: Merge branch 'ab/coc-update-to-2.0'
X-Git-Tag: v2.31.0-rc0~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=381dac23491ee3d80e00787449f0f1c70449419c;p=thirdparty%2Fgit.git

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
---

381dac23491ee3d80e00787449f0f1c70449419c