Merge remote-tracking branch 'upstream/main'

* upstream/main:
  readme: fix link to lri’s old notes
  .macos: adjust toolbar title rollover delay
  .gitconfig: Rely on Git v2.28’s `init.defaultBranch`
  .gitconfig: delete `mpr` alias
  .gitconfig: show most recent branches first
  meta: rename main branch
  .gitconfig: make `git init` default to `main` instead of `master` (mathiasbynens#926)
  .gitconfig: improve `git p` alias (mathiasbynens#896)
  .exports: Hide zsh warning on macOS
  .macos: fix showing ~/Library folder in macOS 10.15 (Catalina) (mathiasbynens#917)

Author: dmcass

.exports

@@ -33,5 +33,5 @@ export MANPAGER='less -X';
 # https://stackoverflow.com/a/42265848/96656
 export GPG_TTY=$(tty);
 
-# React native JS debugger
-export REACT_DEBUGGER="open -g 'rndebugger://set-debugger-loc?host=localhost&port=8081' ||"
+# Hide the “default interactive shell is now zsh” warning on macOS.
+export BASH_SILENCE_DEPRECATION_WARNING=1;

.gitconfig

@@ -1,119 +1,99 @@
 [alias]
 
-    # View abbreviated SHA, description, and history graph of the latest 20 commits
+    # View abbreviated SHA, description, and history graph of the latest 20 commits.
     l = log --pretty=format:'%C(magenta)%G? %C(auto)%h %d %s' -n 20 --graph --abbrev-commit
 
-    # View the current working tree status using the short format
+    # View the current working tree status using the short format.
     s = status -s
 
-    # Full status
+    # Full status.
     st = status
 
-    # Show the diff between the latest commit and the current state
+    # Show the diff between the latest commit and the current state.
     d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
 
-	# Pull in remote changes for the current repository and all its submodules
-	p = git pull --recurse-submodules
-
-    # `git di $number` shows the diff between the state `$number` revisions ago and the current state
+    # `git di $number` shows the diff between the state `$number` revisions ago and the current state.
     di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
 
-    # Pull in remote changes for the current repository and all its submodules
-    p = git pull --recurse-submodules
+    # Pull in remote changes for the current repository and all its submodules.
+    p = pull --recurse-submodules
 
-    # Clone a repository including all submodules
+    # Clone a repository including all submodules.
     c = clone --recursive
 
-    # Commit all changes
+    # Commit all changes.
     ca = !git add -A && git commit -av
 
-    # Switch to a branch, creating it if necessary
+    # Switch to a branch, creating it if necessary.
     go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
 
-    # Checkout
+    # Checkout.
     co = checkout
 
-    # Show verbose output about tags, branches or remotes
+    # Show verbose output about tags, branches or remotes.
     tags = tag -l
     branches = branch -a
     remotes = remote -v
 
-    # List aliases
+    # List aliases.
     aliases = config --get-regexp alias
 
-    # Amend the currently staged files to the latest commit
+    # Amend the currently staged files to the latest commit.
     amend = commit --amend --reuse-message=HEAD
 
-    # Credit an author on the latest commit
+    # Credit an author on the latest commit.
     credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
 
-    # Interactive rebase with the given number of latest commits
+    # Interactive rebase with the given number of latest commits.
     reb = "!r() { git rebase -i HEAD~$1; }; r"
 
     # Remove the old tag with this name and tag the latest commit with it.
     retag = "!r() { git tag -d $1 && git push origin :refs/tags/$1 && git tag $1; }; r"
 
-    # Find branches containing commit
+    # Find branches containing commit.
     fb = "!f() { git branch -a --contains $1; }; f"
 
-    # Find tags containing commit
+    # Find tags containing commit.
     ft = "!f() { git describe --always --contains $1; }; f"
 
-    # Find commits by source code
+    # Find commits by source code.
     fc = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short -S$1; }; f"
 
-    # Find commits by commit message
+    # Find commits by commit message.
     fm = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen  [%cn] %Cred%d' --decorate --date=short --grep=$1; }; f"
 
-    # Remove branches that have already been merged with master
+    # Remove branches that have already been merged with main.
     # a.k.a. ‘delete merged’
     dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
 
     # List contributors with number of commits
     contributors = shortlog --summary --numbered
 
-    # Merge GitHub pull request on top of the current branch or,
-    # if a branch name is specified, on top of the specified branch
-    mpr = "!f() { \
-        declare currentBranch=\"$(git symbolic-ref --short HEAD)\"; \
-        declare branch=\"${2:-$currentBranch}\"; \
-        if [ $(printf \"%s\" \"$1\" | grep '^[0-9]\\+$' > /dev/null; printf $?) -eq 0 ]; then \
-            git fetch origin refs/pull/$1/head:pr/$1 && \
-            git checkout -B $branch && \
-            git rebase $branch pr/$1 && \
-            git checkout -B $branch && \
-            git merge pr/$1 && \
-            git branch -D pr/$1 && \
-            git commit --amend -m \"$(git log -1 --pretty=%B)\n\nCloses #$1.\"; \
-        fi \
-    }; f"
-
     # Show the user email for the current repository.
     whoami = config user.email
 
-    # Amazon recommended alias setup
-    dag = log --graph --format='format:%C(yellow)%h%C(reset) %C(blue)%an <%ae>%C(reset) %C(magenta)%cr%C(reset)%C(auto)%d%C(reset)%n%s' --date-order
-
-	# Show the user email for the current repository.
-	whoami = config user.email
-
 [apply]
 
-    # Detect whitespace errors when applying a patch
+    # Detect whitespace errors when applying a patch.
     whitespace = fix
 
+[branch]
+
+	# Show most recently changed branches first.
+	sort = -committerdate
+
 [core]
 
-    # Use custom `.gitignore` and `.gitattributes`
+    # Use custom `.gitignore` and `.gitattributes`.
     excludesfile = ~/.gitignore
     attributesfile = ~/.gitattributes
 
-    # Treat spaces before tabs and all kinds of trailing whitespace as an error
+    # Treat spaces before tabs and all kinds of trailing whitespace as an error.
     # [default] trailing-space: looks for spaces at the end of a line
     # [default] space-before-tab: looks for spaces before tabs at the beginning of a line
     whitespace = space-before-tab,-indent-with-non-tab,trailing-space
 
-    # Make `git rebase` safer on macOS
+    # Make `git rebase` safer on macOS.
     # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
     trustctime = false
 
@@ -125,7 +105,7 @@
     # https://git-scm.com/docs/git-update-index#_untracked_cache
     untrackedCache = true
 
-    # Amazon recommended pager config
+    # Recommended pager config
     pager = less -FMRiX
 
 [color]
@@ -160,22 +140,22 @@
 
 [diff]
 
-    # Detect copies as well as renames
+    # Detect copies as well as renames.
     renames = copies
 
 [diff "bin"]
 
-    # Use `hexdump` to diff binary files
+    # Use `hexdump` to diff binary files.
     textconv = hexdump -v -C
 
 [help]
 
-    # Automatically correct and execute mistyped commands
+    # Automatically correct and execute mistyped commands.
     autocorrect = 1
 
 [merge]
 
-    # Include summaries of merged commits in newly created merge commit messages
+    # Include summaries of merged commits in newly created merge commit messages.
     log = true
 
 [push]
@@ -206,3 +186,7 @@
 [url "git://gist.github.com/"]
 
     insteadOf = "gist:"
+
+[init]
+
+    defaultBranch = main

.macos

@@ -41,6 +41,9 @@ defaults write NSGlobalDomain AppleShowScrollBars -string "Always"
 # Disable the over-the-top focus ring animation
 defaults write NSGlobalDomain NSUseAnimatedFocusRing -bool false
 
+# Adjust toolbar title rollover delay
+defaults write NSGlobalDomain NSToolbarTitleViewRolloverDelay -float 0
+
 # Disable smooth scrolling
 # (Uncomment if you’re on an older Mac that messes up the animation)
 # defaults write NSGlobalDomain NSScrollAnimationEnabled -bool false
@@ -378,7 +381,7 @@ defaults write com.apple.finder WarnOnEmptyTrash -bool false
 defaults write com.apple.NetworkBrowser BrowseAllInterfaces -bool true
 
 # Show the ~/Library folder
-chflags nohidden ~/Library
+chflags nohidden ~/Library && xattr -d com.apple.FinderInfo ~/Library
 
 # Show the /Volumes folder
 sudo chflags nohidden /Volumes

README.md

@@ -31,7 +31,7 @@ set -- -f; source bootstrap.sh
 To install these dotfiles without Git:
 
 ```bash
-cd; curl -#L https://github.com/dmcass/dotfiles/tarball/master | tar -xzv --strip-components 1 --exclude={README.md,bootstrap.sh,.osx,LICENSE-MIT.txt}
+cd; curl -#L https://github.com/dmcass/dotfiles/tarball/master | tar -xzv --strip-components 1 --exclude={README.md,bootstrap.sh,LICENSE-MIT.txt}
 ```
 
 To update later on, just run that command again.
@@ -101,7 +101,7 @@ Suggestions/improvements
 * [Cătălin Mariș](https://github.com/alrra) and his [dotfiles repository](https://github.com/alrra/dotfiles)
 * [Gianni Chiappetta](https://butt.zone/) for sharing his [amazing collection of dotfiles](https://github.com/gf3/dotfiles)
 * [Jan Moesen](http://jan.moesen.nu/) and his [ancient `.bash_profile`](https://gist.github.com/1156154) + [shiny _tilde_ repository](https://github.com/janmoesen/tilde)
-* [Lauri ‘Lri’ Ranta](http://lri.me/) for sharing [loads of hidden preferences](http://osxnotes.net/defaults.html)
+* Lauri ‘Lri’ Ranta for sharing [loads of hidden preferences](https://web.archive.org/web/20161104144204/http://osxnotes.net/defaults.html)
 * [Matijs Brinkhuis](https://matijs.brinkhu.is/) and his [dotfiles repository](https://github.com/matijs/dotfiles)
 * [Nicolas Gallagher](http://nicolasgallagher.com/) and his [dotfiles repository](https://github.com/necolas/dotfiles)
 * [Sindre Sorhus](https://sindresorhus.com/)

bootstrap.sh

@@ -2,7 +2,7 @@
 
 cd "$(dirname "${BASH_SOURCE}")";
 
-git pull origin master;
+git pull origin main;
 
 function doIt() {
     rsync --exclude ".git/" \