From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Oct 2018 05:22:09 +0000 (+0900)
Subject: Merge branch 'bc/editorconfig'
X-Git-Tag: v2.20.0-rc0~144
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=778bb5eaaac8f12406e6c56751886114c6a4ef4d;p=git.git

Merge branch 'bc/editorconfig'

To help developers, an EditorConfig file that attempts to follow
the project convention has been added.

* bc/editorconfig:
  editorconfig: indicate settings should be kept in sync
  editorconfig: provide editor settings for Git developers
---

778bb5eaaac8f12406e6c56751886114c6a4ef4d