Merge remote-tracking branch 'super/main'

# By Mathias Bynens (8) and others
# Via GitHub
* super/main:
  .gitconfig: exclude submodules
  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)

# Conflicts:
#	.gitconfig

Author: Sumeru Chatterjee

.exports

@@ -34,3 +34,6 @@ export MANPAGER='less -X';
 # Avoid issues with `gpg` as installed via Homebrew.
 # https://stackoverflow.com/a/42265848/96656
 export GPG_TTY=$(tty);
+
+# Hide the “default interactive shell is now zsh” warning on macOS.
+export BASH_SILENCE_DEPRECATION_WARNING=1;

.gitconfig

@@ -1,44 +1,44 @@
 [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=oneline -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
 
-# 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"
 
-# `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
-ca = !git add -A && git commit -av
+# Commit all changes.
+ca = !git add ':(exclude,attr:builtin_objectmode=160000)' && 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"
 
 # Show verbose output about tags, branches or remotes
 tags = tag -l
-branches = branch -a
-remotes = remote -v
+branches = branch --all
+remotes = remote --verbose
 
-# 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.
@@ -56,7 +56,7 @@ fc = "!f() { git log --pretty=format:'%C(yellow)%h  %Cblue%ad  %Creset%s%Cgreen
 # 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"
 # Advanced Stashing
@@ -97,29 +97,36 @@ mpr = "!f() { \
 
 # view all deleted lines ignoring whitespace
 reposize = "du -hs $(git rev-parse --show-toplevel)"
+# List contributors with number of commits.
+contributors = shortlog --summary --numbered
 
 # 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_global
 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
 autoclrf = input
 editor = vim
 
-# 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
 
@@ -164,17 +171,17 @@ template = ~/.stCommitMsg
 
 [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]
@@ -231,3 +238,6 @@ prompt = false
 mergeoptions = --no-ff
 [branch "develop"]
 mergeoptions = --no-ff
+[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
@@ -336,7 +339,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

.osx

@@ -1 +1 @@
-# 301 https://github.com/mathiasbynens/dotfiles/blob/master/.macos
+# 301 https://github.com/mathiasbynens/dotfiles/blob/main/.macos

README.md

@@ -31,7 +31,7 @@ set -- -f; source bootstrap.sh
 To install these dotfiles without Git:
 
 ```bash
-cd; curl -#L https://github.com/mathiasbynens/dotfiles/tarball/master | tar -xzv --strip-components 1 --exclude={README.md,bootstrap.sh,.osx,LICENSE-MIT.txt}
+cd; curl -#L https://github.com/mathiasbynens/dotfiles/tarball/main | tar -xzv --strip-components 1 --exclude={README.md,bootstrap.sh,.osx,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/" \