[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-641-gd2541c7

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  d2541c763f55bc4f31d7a42c77d9488f6e81c31e (commit)
       via  a77d597b86d2632372ab16963c075858d1a292fd (commit)
      from  4969b98f735f715d6d9b8fac7e1eb6b8d403afb3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2541c763f55bc4f31d7a42c77d9488f6e81c31e
commit d2541c763f55bc4f31d7a42c77d9488f6e81c31e
Merge: 4969b98 a77d597
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 30 16:13:37 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 30 16:13:37 2016 -0400

    Merge topic 'clang-format-script' into next
    
    a77d597b clang-format.bash: Fix filter-branch example documentation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a77d597b86d2632372ab16963c075858d1a292fd
commit a77d597b86d2632372ab16963c075858d1a292fd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 30 15:55:22 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 30 16:11:36 2016 -0400

    clang-format.bash: Fix filter-branch example documentation
    
    Inside `git filter-branch --tree-filter` we must format all tracked
    files because formatting of the tree for each commit is independent
    from earlier commits.

diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash
index 760a8d4..a9ef62b 100755
--- a/Utilities/Scripts/clang-format.bash
+++ b/Utilities/Scripts/clang-format.bash
@@ -36,15 +36,19 @@ Example to format locally modified files staged for commit:
 
     Utilities/Scripts/clang-format.bash --cached
 
-Example to format the current topic:
+Example to format files modified by the most recent commit:
 
-    git filter-branch \
-      --tree-filter "Utilities/Scripts/clang-format.bash --amend" \
-      master..
+    Utilities/Scripts/clang-format.bash --amend
 
 Example to format all files:
 
     Utilities/Scripts/clang-format.bash --tracked
+
+Example to format the current topic:
+
+    git filter-branch \
+      --tree-filter "Utilities/Scripts/clang-format.bash --tracked" \
+      master..
 '
 
 die() {

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Scripts/clang-format.bash |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake