Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save kevincantu/497ac886d7e58844b5bf74c4595f2f89 to your computer and use it in GitHub Desktop.
Save kevincantu/497ac886d7e58844b5bf74c4595f2f89 to your computer and use it in GitHub Desktop.
User experience rebasing a working branch to origin/master after we've merged (currently AKA: origin/kevin-eol-cleanup)
# update the .gitattributes
git add .gitattributes
git commit -am "cleaning up line endings"
# force Git to re-index everything
rm .git/index
git reset
git add -u
# now modify that commit
git commit --amend
grep -rlUP "\r$" * | grep -i "\.json"
grep -rlUP "\r$" * | grep -i "\.m" | grep -v "PacletInfo\.m" | sed -e "s/\/.*//" | sort | uniq -c | sort
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment