Skip to content

re-run clang-format, modify brace formatting#970

Merged
stevengj merged 2 commits intomasterfrom
brace-format
Jul 19, 2019
Merged

re-run clang-format, modify brace formatting#970
stevengj merged 2 commits intomasterfrom
brace-format

Conversation

@stevengj
Copy link
Collaborator

@stevengj stevengj commented Jul 19, 2019

Similar to #662:

Instructions for rebasing other branches after this PR:

Replace MYBRANCH below with the name of your branch:

# update repo
git checkout master && git pull origin master # update master

# switch to your branch
git checkout MYBRANCH

# rebase onto PREVIOUS commit
git rebase 72a3eeddf6d3a3e916c8e1603fa0fffe9d31cd29

# fetch the new .clang-format file
curl -o .clang-format https://raw.githubusercontent.com/NanoComp/meep/aa0b54b2a2c2984468469de390dd0537729ea68e/.clang-format

# reformat and rebase to THIS PR's commit
find . -name '*.*pp' | xargs clang-format -i
git commit -a -m "reformat"
git rebase -X theirs aa0b54b2a2c2984468469de390dd0537729ea68e

# finish rebase
git rebase master

@stevengj stevengj merged commit aa0b54b into master Jul 19, 2019
@stevengj stevengj deleted the brace-format branch July 19, 2019 12:21
bencbartlett pushed a commit to bencbartlett/meep that referenced this pull request Sep 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant