Last active
March 17, 2021 02:03
-
-
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)
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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