diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:38:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 11:38:45 -0700 |
| commit | aa4bffa23599e0c2e611be7012ecb5f596ef88b5 (patch) | |
| tree | 42ffbc378b3bcea5d93624e02e66baf8352f9280 /t/t3310-notes-merge-manual-resolve.sh | |
| parent | Merge branch 'nd/status-auto-comment-char' (diff) | |
| parent | CodingGuidelines: avoid "test <cond> -a/-o <cond>" (diff) | |
| download | tgif-aa4bffa23599e0c2e611be7012ecb5f596ef88b5.tar.xz | |
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
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions