Skip to content

Commit

Permalink
meta: rename main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
mathiasbynens committed Jun 16, 2020
1 parent edea61c commit c886e13
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion .osx
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# 301 https://github.com/mathiasbynens/dotfiles/blob/master/.macos
# 301 https://github.com/mathiasbynens/dotfiles/blob/main/.macos
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

cd "$(dirname "${BASH_SOURCE}")";

git pull origin master;
git pull origin main;

function doIt() {
rsync --exclude ".git/" \
Expand Down

0 comments on commit c886e13

Please sign in to comment.