r288605 - Add the --no-color option to the git call in the doc when using clang-format-diff

[Sylvestre Ledru via cfe-commits]

Author: sylvestre
Date: Sat Dec  3 17:22:45 2016
New Revision: 288605

URL: http://llvm.org/viewvc/llvm-project?rev=288605&view=rev
Log:
Add the --no-color option to the git call in the doc when using clang-format-diff

Modified:
    cfe/trunk/docs/ClangFormat.rst
    cfe/trunk/tools/clang-format/clang-format-diff.py

Modified: cfe/trunk/docs/ClangFormat.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/ClangFormat.rst?rev=288605&r1=288604&r2=288605&view=diff
==============================================================================
--- cfe/trunk/docs/ClangFormat.rst (original)
+++ cfe/trunk/docs/ClangFormat.rst Sat Dec  3 17:22:45 2016
@@ -184,7 +184,7 @@ So to reformat all the lines in the late
 
 .. code-block:: console
 
-  git diff -U0 HEAD^ | clang-format-diff.py -i -p1
+  git diff -U0 --no-color HEAD^ | clang-format-diff.py -i -p1
 
 In an SVN client, you can do:
 

Modified: cfe/trunk/tools/clang-format/clang-format-diff.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/clang-format-diff.py?rev=288605&r1=288604&r2=288605&view=diff
==============================================================================
--- cfe/trunk/tools/clang-format/clang-format-diff.py (original)
+++ cfe/trunk/tools/clang-format/clang-format-diff.py Sat Dec  3 17:22:45 2016
@@ -17,7 +17,7 @@ This script reads input from a unified d
 lines. This is useful to reformat all the lines touched by a specific patch.
 Example usage for git/svn users:
 
-  git diff -U0 HEAD^ | clang-format-diff.py -p1 -i
+  git diff -U0 --no-color HEAD^ | clang-format-diff.py -p1 -i
   svn diff --diff-cmd=diff -x-U0 | clang-format-diff.py -i
 
 """