summaryrefslogtreecommitdiffstats
path: root/clang/tools/clang-format
diff options
context:
space:
mode:
Diffstat (limited to 'clang/tools/clang-format')
-rw-r--r--clang/tools/clang-format/ClangFormat.cpp2
-rwxr-xr-xclang/tools/clang-format/clang-format-diff.py8
2 files changed, 6 insertions, 4 deletions
diff --git a/clang/tools/clang-format/ClangFormat.cpp b/clang/tools/clang-format/ClangFormat.cpp
index cd28c595fd8..2d415b358fc 100644
--- a/clang/tools/clang-format/ClangFormat.cpp
+++ b/clang/tools/clang-format/ClangFormat.cpp
@@ -64,7 +64,7 @@ LineRanges("lines", cl::desc("<start line>:<end line> - format a range of\n"
static cl::opt<std::string>
Style("style",
cl::desc("Coding style, currently supports:\n"
- " LLVM, Google, Chromium, Mozilla.\n"
+ " LLVM, Google, Chromium, Mozilla, WebKit.\n"
"Use -style=file to load style configuration from\n"
".clang-format file located in one of the parent\n"
"directories of the source file (or current\n"
diff --git a/clang/tools/clang-format/clang-format-diff.py b/clang/tools/clang-format/clang-format-diff.py
index bb18730b63c..89fa0521eee 100755
--- a/clang/tools/clang-format/clang-format-diff.py
+++ b/clang/tools/clang-format/clang-format-diff.py
@@ -82,11 +82,13 @@ def formatRange(r, style):
def main():
parser = argparse.ArgumentParser(description=
- 'Reformat changed lines in diff')
+ 'Reformat changed lines in diff.')
parser.add_argument('-p', default=0,
help='strip the smallest prefix containing P slashes')
- parser.add_argument('-style',
- help='formatting style to apply (LLVM, Google, Chromium)')
+ parser.add_argument(
+ '-style',
+ help=
+ 'formatting style to apply (LLVM, Google, Chromium, Mozilla, WebKit)')
args = parser.parse_args()
filename = None
OpenPOWER on IntegriCloud