Merge 5615da920f into 63a92cbc29

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).
 
-_1546 TILs and counting..._
+_1547 TILs and counting..._
 
 ---
 
@@ -191,7 +191,7 @@ _1546 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)
@@ -383,6 +383,7 @@ _1546 TILs and counting..._
 - [Untrack A Directory Of Files Without Deleting](git/untrack-a-directory-of-files-without-deleting.md)
 - [Untrack A File Without Deleting It](git/untrack-a-file-without-deleting-it.md)
 - [Update The URL Of A Remote](git/update-the-url-of-a-remote.md)
+- [Use External Diff Tool Like Difftastic](git/use-external-diff-tool-like-difftastic.md)
 - [Using Commands With A Relative Date Format](git/using-commands-with-a-relative-date-format.md)
 - [Verbose Commit Message](git/verbose-commit-message.md)
 - [Viewing A File On Another Branch](git/viewing-a-file-on-another-branch.md)
@@ -747,7 +748,7 @@ _1546 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/use-external-diff-tool-like-difftastic.md

@@ -0,0 +1,23 @@
+# Use External Diff Tool Like Difftastic
+
+Assuming we already have a tool like `difft`
+([difftastic](https://difftastic.wilfred.me.uk/introduction.html)) available on
+our machine, we can use it as a diff viewer for the various `git` commands that
+display a diff.
+
+This requires a manual override which involve two pieces — an inline
+configuration of `diff.external` specifying the binary of the external differ
+and the `--ext-diff` flag which tells these commands to use the external diff
+binary.
+
+Here is what `git show` looks like with `difft`:
+
+```bash
+$ git -c diff.external=difft show --ext-diff
+```
+
+Without the `--ext-diff` flag, it will fallback to the default differ despite
+`diff.external` being set.
+
+See `man git-diff` and friends for the `--ext-diff` flag. See `man git-config`
+for `diff.external`.