![]() android-studio/bin/format.sh -m '*.java' -r brouter-routing-app To rebase active branches on top of the new master just rebase your branch onto the commit prior to the reformatting and format every commit of your branch using (<commit> should be replaced by this commit) git rebase \ --strategy-option=theirs \ --onto <commit> \ --exec 'format.sh -m "*.java" -r brouter-routing-app' \ --exec 'git commit --all --no-edit --amend' \ <commit>~ To ignore this mass edit during git blame see `.git-blame-ignore-revs` |
||
---|---|---|
.. | ||
src/main | ||
.gitignore | ||
build.gradle | ||
proguard-rules.pro |