Merge remote-tracking branch 'upstream/master'

* upstream/master:
  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

Author: alexdiliberto

.config/git/template/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/main

.exports

@@ -33,3 +33,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

@@ -194,8 +194,8 @@
 
   # 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
   aliases = config --get-regexp alias
@@ -231,22 +231,6 @@
   # 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
 
@@ -255,6 +239,11 @@
   # Detect whitespace errors when applying a patch
   whitespace = fix
 
+[branch]
+
+	# Show most recently changed branches first.
+	sort = -committerdate
+
 [credential]
 
   helper = osxkeychain

.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.

bootstrap.sh

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