summaryrefslogtreecommitdiffhomepage
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2020-01-27 18:26:26 -0800
committergVisor bot <gvisor-bot@google.com>2020-01-27 18:27:20 -0800
commit5776a7b6f6b52faf6e0735c3f4a892639c1bd773 (patch)
tree608f7d112154a25b2168b08f7c081f851494609e /CONTRIBUTING.md
parentdb68c85ab707b992c27d66b095165a33a621dc2d (diff)
Fix header ordering and format all C++ code.
PiperOrigin-RevId: 291844200
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5d46168bc..55a1ad0d9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -36,7 +36,8 @@ directory tree.
All Go code should conform to the [Go style guidelines][gostyle]. C++ code
should conform to the [Google C++ Style Guide][cppstyle] and the guidelines
-described for [tests][teststyle].
+described for [tests][teststyle]. Note that code may be automatically formatted
+per the guidelines when merged.
As a secure runtime, we need to maintain the safety of all of code included in
gVisor. The following rules help mitigate issues.