Skip to content

Instantly share code, notes, and snippets.

@roberth
Created April 10, 2019 13:03
Show Gist options
  • Save roberth/9699dacf4286afb73f60a792e6ce64c3 to your computer and use it in GitHub Desktop.
Save roberth/9699dacf4286afb73f60a792e6ce64c3 to your computer and use it in GitHub Desktop.
Rebase with formatting change
git checkout feature-branch
git commit -m 'Buffer' --allow-empty
git rebase -i <origin/master or similar>
# uncomment buffer commit, reorder into
# pick Buffer
# <pick feature-branch commits>
git filter-branch --tree-filter './scripts/format-all' <origin/master or similar>..HEAD
# inspect the new Buffer commit and act accordingly
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment