Merge 5615da920f into db00ec69c2

README.md

@@ -10,7 +10,7 @@ pairing with smart people at Hashrocket.
 
 For a steady stream of TILs, [sign up for my newsletter](https://crafty-builder-6996.ck.page/e169c61186).
 
-_1534 TILs and counting..._
+_1535 TILs and counting..._
 
 ---
 
@@ -191,7 +191,7 @@ _1534 TILs and counting..._
 - [Aliasing An Ansible Host](devops/aliasing-an-ansible-host.md)
 - [Allow Cross-Origin Requests To Include Cookies](devops/allow-cross-origin-requests-to-include-cookies.md)
 - [Allow HTTPS Through Your UFW Firewall](devops/allow-https-through-your-ufw-firewall.md)
-- [Check For Cached Site Assocation File For iOS](devops/check-for-cached-site-association-file-for-ios.md)
+- [Check For Cached Site Association File For iOS](devops/check-for-cached-site-association-file-for-ios.md)
 - [Check The Status of All Services](devops/check-the-status-of-all-services.md)
 - [Check The Syntax Of nginx Files](devops/check-the-syntax-of-nginx-files.md)
 - [Connect To An RDS PostgreSQL Database](devops/connect-to-an-rds-postgresql-database.md)
@@ -317,6 +317,7 @@ _1534 TILs and counting..._
 - [Grab A Single File From A Stash](git/grab-a-single-file-from-a-stash.md)
 - [Grep For A Pattern On Another Branch](git/grep-for-a-pattern-on-another-branch.md)
 - [Grep Over Commit Messages](git/grep-over-commit-messages.md)
+- [Highlight Extra Whitespace In Diff Output](git/highlight-extra-whitespace-in-diff-output.md)
 - [Ignore Changes To A Tracked File](git/ignore-changes-to-a-tracked-file.md)
 - [Ignore Files Specific To Your Workflow](git/ignore-files-specific-to-your-workflow.md)
 - [Include A Message With Your Stashed Changes](git/include-a-message-with-your-stashed-changes.md)
@@ -738,7 +739,7 @@ _1534 TILs and counting..._
 - [Check If Clusters Are Upgrade Compatible](postgres/check-if-clusters-are-upgrade-compatible.md)
 - [Check If The Local Server Is Running](postgres/check-if-the-local-server-is-running.md)
 - [Check If User Role Exists For Database](postgres/check-if-user-role-exists-for-database.md)
-- [Check Table For Any Oprhaned Records](postgres/check-table-for-any-orphaned-records.md)
+- [Check Table For Any Orphaned Records](postgres/check-table-for-any-orphaned-records.md)
 - [Checking Inequality](postgres/checking-inequality.md)
 - [Checking The Type Of A Value](postgres/checking-the-type-of-a-value.md)
 - [Clear The Screen In psql](postgres/clear-the-screen-in-psql.md)

git/highlight-extra-whitespace-in-diff-output.md

@@ -0,0 +1,30 @@
+# Highlight Extra Whitespace In Diff Output
+
+When running a `git diff` (or `git add --patch`) I'll sometimes come across
+lines that don't have any visible changes. This is usually because some
+whitespace characters were either added (on accident) or removed (often by a
+autoformatter).
+
+Depending on the `core.whitespace` config, you'll probably see at least some of
+the whitespace errors that git provides. By default, git only highlights
+whitespace errors on added (`new`) lines. However if some extra whitespace was
+originally committed and is now being removed, it won't be highlighted on the
+`old` line in the diff.
+
+We can have git always highlight whitespace errors by setting
+`wsErrorHighlight` to `all` in the global git config.
+
+```bash
+$ git config --global diff.wsErrorHighlight all
+```
+
+Which updates the global gitconfig file with the following line:
+
+```
+[diff]
+	wsErrorHighlight = all
+```
+
+The `all` option is a shorthand for `old,new,context`.
+
+See `man git-diff` for more details.