From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:38:44 +0000 (-0700)
Subject: Merge branch 'jc/coding-guidelines'
X-Git-Tag: v2.1.0-rc0~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa4bffa23599e0c2e611be7012ecb5f596ef88b5;p=git

Merge branch 'jc/coding-guidelines'

* jc/coding-guidelines:
  CodingGuidelines: avoid "test <cond> -a/-o <cond>"
  CodingGuidelines: on splitting a long line
  CodingGuidelines: on comparison
  CodingGuidelines: do not call the conditional statement "if()"
  CodingGuidelines: give an example for shell function preamble
  CodingGuidelines: give an example for control statements
  CodingGuidelines: give an example for redirection
  CodingGuidelines: give an example for case/esac statement
  CodingGuidelines: once it is in, it is not worth the code churn
---

aa4bffa23599e0c2e611be7012ecb5f596ef88b5