diff options
author | Brad King <brad.king@kitware.com> | 2016-05-16 10:30:14 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 16:04:46 -0400 |
commit | 82df6deaafb36cbbfd450202bb20b320f637751a (patch) | |
tree | 3e5ea77fd3ebeb0dae57dedbed9d6522c89cea51 /Source | |
parent | 6a13f43f309dd3484c3339730d141c89ecb27101 (diff) | |
download | cmake-82df6deaafb36cbbfd450202bb20b320f637751a.tar.gz |
Empty commit at end of history preceding clang-format style transition
This is an empty commit that precedes an automatic application of
clang-format to update the C++ style of our entire source tree.
This may be helpful to rebase a topic branch that was originally
based on a commit preceding the transition. One may first rebase
the topic on this commit. Then use one of the following approaches.
* Rewrite the topic, including this commit, using `git filter-branch`
`--tree-filter` with `Utilities/Scripts/clang-format.bash` to update
the style in every commit. Rebase the revised topic, excluding the
rewrite of this commit, on the style transition commit.
OR
* Add a `.git/info/grafts` entry to change the parent of the first
commit in the topic from this commit to the style transition commit.
Rewrite the topic using `git filter-branch --tree-filter` with
`Utilities/Scripts/clang-format.bash` to update the style in every
commit. Then remove the graft, which was resolved by the filter.
See `git help filter-branch` and `git help repository-layout` for
details.
Diffstat (limited to 'Source')
0 files changed, 0 insertions, 0 deletions