Merge remote-tracking branch 'upstream/master'

* upstream/master:
  .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)
  .gitconfig: Add `g whoami`

Author: mdjnewman

.exports

@@ -33,6 +33,9 @@ export MANPAGER='less -X';
 # 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;
+
 # Android tools home
 ANDROID_HOME=/usr/local/share/android-sdk
 if [ -d "$ANDROID_HOME" ]; then

.gitconfig

@@ -13,7 +13,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
@@ -79,6 +79,9 @@
 		fi \
 	}; f"
 
+	# Show the user email for the current repository.
+	whoami = config user.email
+
 [apply]
 
 	# Detect whitespace errors when applying a patch

.macos

@@ -336,7 +336,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