diff options
author | Alexander Kornienko <alexfh@google.com> | 2013-09-02 16:39:23 +0000 |
---|---|---|
committer | Alexander Kornienko <alexfh@google.com> | 2013-09-02 16:39:23 +0000 |
commit | e3648fbe1a78340dbcd8c17f9cd7dceeaffdf339 (patch) | |
tree | 65f37c3844a29b0fdbecf9e33a63cadd9653db21 /clang/docs/ClangFormat.rst | |
parent | 815c635cec733e183b2408af493182a4718e1261 (diff) | |
download | llvm-e3648fbe1a78340dbcd8c17f9cd7dceeaffdf339.zip llvm-e3648fbe1a78340dbcd8c17f9cd7dceeaffdf339.tar.gz llvm-e3648fbe1a78340dbcd8c17f9cd7dceeaffdf339.tar.bz2 |
Added WebKit style to the BasedOnStyle handling and to the relevant help messages.
llvm-svn: 189765
Diffstat (limited to 'clang/docs/ClangFormat.rst')
-rw-r--r-- | clang/docs/ClangFormat.rst | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/docs/ClangFormat.rst b/clang/docs/ClangFormat.rst index 489b9b7..b932007 100644 --- a/clang/docs/ClangFormat.rst +++ b/clang/docs/ClangFormat.rst @@ -54,7 +54,7 @@ to format C/C++/Obj-C code. Can only be used with one input file. -output-replacements-xml - Output replacements as XML. -style=<string> - Coding style, currently supports: - LLVM, Google, Chromium, Mozilla. + LLVM, Google, Chromium, Mozilla, WebKit. Use -style=file to load style configuration from .clang-format file located in one of the parent directories of the source file (or current @@ -139,12 +139,13 @@ a unified diff and reformats all contained lines with :program:`clang-format`. usage: clang-format-diff.py [-h] [-p P] [-style STYLE] - Reformat changed lines in diff + Reformat changed lines in diff. optional arguments: -h, --help show this help message and exit -p P strip the smallest prefix containing P slashes - -style STYLE formatting style to apply (LLVM, Google, Chromium) + -style STYLE formatting style to apply (LLVM, Google, Chromium, Mozilla, + WebKit) So to reformat all the lines in the latest :program:`git` commit, just do: |