Merge remote-tracking branch 'upstream/master'

* upstream/master:
  .gitconfig: improve `git p` alias (mathiasbynens#896)
  .exports: Hide zsh warning on macOS

Author: alexdiliberto

.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

@@ -181,7 +181,7 @@
   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
+  p = pull --recurse-submodules
 
   # Clone a repository including all submodules
   c = clone --recursive