Merge branch 'main' of github.com:mathiasbynens/dotfiles

* 'main' of github.com:mathiasbynens/dotfiles:
  .macos: adjust toolbar title rollover delay
  .gitconfig: Rely on Git v2.28’s `init.defaultBranch`
  .gitconfig: delete `mpr` alias
  .gitconfig: show most recent branches first
  meta: rename main branch
  .gitconfig: make `git init` default to `main` instead of `master` (mathiasbynens#926)
  .gitconfig: improve `git p` alias (mathiasbynens#896)

Author: mohsin

.gitconfig

@@ -1,44 +1,44 @@
 [alias]
 
-	# View abbreviated SHA, description, and history graph of the latest 20 commits
+	# View abbreviated SHA, description, and history graph of the latest 20 commits.
 	l = log --pretty=oneline -n 20 --graph --abbrev-commit
 
-	# View the current working tree status using the short format
+	# View the current working tree status using the short format.
 	s = status -s
 
-	# Show the diff between the latest commit and the current state
+	# Show the diff between the latest commit and the current state.
 	d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
 
-	# `git di $number` shows the diff between the state `$number` revisions ago and the current state
+	# `git di $number` shows the diff between the state `$number` revisions ago and the current state.
 	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
+	# Pull in remote changes for the current repository and all its submodules.
+	p = pull --recurse-submodules
 
-	# Clone a repository including all submodules
+	# Clone a repository including all submodules.
 	c = clone --recursive
 
-	# Commit all changes
+	# Commit all changes.
 	ca = !git add -A && git commit -av
 
-	# Switch to a branch, creating it if necessary
+	# Switch to a branch, creating it if necessary.
 	go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
 
 	# 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
+	# List aliases.
 	aliases = config --get-regexp alias
 
-	# Amend the currently staged files to the latest commit
+	# Amend the currently staged files to the latest commit.
 	amend = commit --amend --reuse-message=HEAD
 
-	# Credit an author on the latest commit
+	# Credit an author on the latest commit.
 	credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
 
-	# Interactive rebase with the given number of latest commits
+	# Interactive rebase with the given number of latest commits.
 	reb = "!r() { git rebase -i HEAD~$1; }; r"
 
 	# Remove the old tag with this name and tag the latest commit with it.
@@ -56,49 +56,38 @@
 	# 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"
 
-	# List contributors with number of commits
+	# 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
 
 [apply]
 
-	# Detect whitespace errors when applying a patch
+	# Detect whitespace errors when applying a patch.
 	whitespace = fix
 
+[branch]
+
+	# Show most recently changed branches first.
+	sort = -committerdate
+
 [core]
 
-	# Use custom `.gitignore` and `.gitattributes`
+	# Use custom `.gitignore` and `.gitattributes`.
 	excludesfile = ~/.gitignore
 	attributesfile = ~/.gitattributes
 
-	# Treat spaces before tabs and all kinds of trailing whitespace as an error
+	# Treat spaces before tabs and all kinds of trailing whitespace as an error.
 	# [default] trailing-space: looks for spaces at the end of a line
 	# [default] space-before-tab: looks for spaces before tabs at the beginning of a line
 	whitespace = space-before-tab,-indent-with-non-tab,trailing-space
 
-	# Make `git rebase` safer on macOS
+	# Make `git rebase` safer on macOS.
 	# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
 	trustctime = false
 
@@ -142,12 +131,12 @@
 
 [diff]
 
-	# Detect copies as well as renames
+	# Detect copies as well as renames.
 	renames = copies
 
 [diff "bin"]
 
-	# Use `hexdump` to diff binary files
+	# Use `hexdump` to diff binary files.
 	textconv = hexdump -v -C
 
 [diff "bin"]
@@ -156,7 +145,7 @@
 
 [help]
 
-	# Automatically correct and execute mistyped commands
+	# Automatically correct and execute mistyped commands.
 	autocorrect = 1
 
 [merge]
@@ -192,3 +181,7 @@
 [url "git://gist.github.com/"]
 
 	insteadOf = "gist:"
+
+[init]
+
+	defaultBranch = main

.macos

@@ -41,6 +41,9 @@ defaults write NSGlobalDomain AppleShowScrollBars -string "Always"
 # Disable the over-the-top focus ring animation
 defaults write NSGlobalDomain NSUseAnimatedFocusRing -bool false
 
+# Adjust toolbar title rollover delay
+defaults write NSGlobalDomain NSToolbarTitleViewRolloverDelay -float 0
+
 # Disable smooth scrolling
 # (Uncomment if you’re on an older Mac that messes up the animation)
 #defaults write NSGlobalDomain NSScrollAnimationEnabled -bool false

.osx

@@ -0,0 +1 @@
+# 301 https://github.com/mathiasbynens/dotfiles/blob/main/.macos

README.md

@@ -3,6 +3,9 @@
 This fork of [Mathias Bynens dotfiles](https://github.com/mathiasbynens/dotfiles) is a custom dotfiles build tailored to my preferences of a OS X development machine. Suggestions or hacks that are more effective are welcome.
 
 ## Installation
+
+**Warning:** If you want to give these dotfiles a try, you should first fork this repository, review the code, and remove things you don’t want or need. Don’t blindly use my settings unless you know what that entails. Use at your own risk!
+
 ### Using Git and the bootstrap script
 
 You can clone the repository wherever you want. (I like to keep it in `~/Projects/dotfiles`, with `~/dotfiles` as a symlink.) The bootstrapper script will pull in the latest version and copy the files to your home folder.
@@ -33,6 +36,35 @@ cd; curl -#L https://github.com/SaifurRahmanMohsin/dotfiles/tarball/master | tar
 
 To update later on, just run that command again.
 
+### Specify the `$PATH`
+
+If `~/.path` exists, it will be sourced along with the other files, before any feature testing (such as [detecting which version of `ls` is being used](https://github.com/mathiasbynens/dotfiles/blob/aff769fd75225d8f2e481185a71d5e05b76002dc/.aliases#L21-L26)) takes place.
+
+Here’s an example `~/.path` file that adds `/usr/local/bin` to the `$PATH`:
+
+```bash
+export PATH="/usr/local/bin:$PATH"
+```
+
+### Add custom commands without creating a new fork
+
+If `~/.extra` exists, it will be sourced along with the other files. You can use this to add a few custom commands without the need to fork this entire repository, or to add commands you don’t want to commit to a public repository.
+
+My `~/.extra` looks something like this:
+
+```bash
+# Git credentials
+# Not in the repository, to prevent people from accidentally committing under my name
+GIT_AUTHOR_NAME="Mathias Bynens"
+GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
+git config --global user.name "$GIT_AUTHOR_NAME"
+GIT_AUTHOR_EMAIL="[email protected]"
+GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"
+git config --global user.email "$GIT_AUTHOR_EMAIL"
+```
+
+You could also use `~/.extra` to override settings, functions and aliases from my dotfiles repository. It’s probably better to [fork this repository](https://github.com/mathiasbynens/dotfiles/fork) instead, though.
+
 ### Sensible macOS defaults
 
 When setting up a new Mac, you may want to set some sensible macOS defaults:
@@ -48,3 +80,4 @@ When setting up a new Mac, you may want to install some common [Homebrew](https:
 ```bash
 ./brew.sh
 ```
+

bootstrap.sh

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