diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-03 15:23:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-03 15:23:55 -0800 |
| commit | b281796eeb925f5e91d27cd6c6c579c925577160 (patch) | |
| tree | 81a2a185c76af961dfa5145a30779b5f59170202 /Documentation/CodingGuidelines | |
| parent | 1c2ab4303354da23ff74ce2ea4a99b69fcfae825 (diff) | |
| parent | 6079ec6680da5e40d15d981c24051e9bf5c226fc (diff) | |
| download | git-b281796eeb925f5e91d27cd6c6c579c925577160.tar.xz | |
Merge branch 'maint' to sync with Git 1.7.3.3
* maint:
Git 1.7.3.3
CodingGuidelines: mention whitespace preferences for shell scripts
Documentation: do not misinterpret pull refspec as bold text
Conflicts:
Documentation/git-pull.txt
RelNotes
Diffstat (limited to 'Documentation/CodingGuidelines')
| -rw-r--r-- | Documentation/CodingGuidelines | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 09ffc46563..46f8a3fab1 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -31,6 +31,10 @@ But if you must have a list of rules, here they are. For shell scripts specifically (not exhaustive): + - We use tabs for indentation. + + - Case arms are indented at the same depth as case and esac lines. + - We prefer $( ... ) for command substitution; unlike ``, it properly nests. It should have been the way Bourne spelled it from day one, but unfortunately isn't. |