From c886e139233320e29fd882960ba3dd388d57afd7 Mon Sep 17 00:00:00 2001
From: Mathias Bynens <mathias@qiwi.be>
Date: Tue, 16 Jun 2020 23:35:12 +0200
Subject: [PATCH] meta: rename main branch

---
 .gitconfig   | 2 +-
 .osx         | 2 +-
 README.md    | 2 +-
 bootstrap.sh | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 69f8a54e336..b4d26657725 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -56,7 +56,7 @@
 	# 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"
 
diff --git a/.osx b/.osx
index 4eacb4e03b7..df12aac66b3 100644
--- a/.osx
+++ b/.osx
@@ -1 +1 @@
-# 301 https://github.com/mathiasbynens/dotfiles/blob/master/.macos
+# 301 https://github.com/mathiasbynens/dotfiles/blob/main/.macos
diff --git a/README.md b/README.md
index 7effe343d2c..d7bca276ad5 100644
--- a/README.md
+++ b/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.
diff --git a/bootstrap.sh b/bootstrap.sh
index 6844b84a624..5894c6c22f2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,7 +2,7 @@
 
 cd "$(dirname "${BASH_SOURCE}")";
 
-git pull origin master;
+git pull origin main;
 
 function doIt() {
 	rsync --exclude ".git/" \