Inclusive Naming

Word Replacement List

Master

  • main

  • control plane

  • original

  • source

  • trunk

Master, Slave

  • Control plane/control plane node

  • Controller/doer

  • Primary/replica

  • Primary/secondary

  • Leader/follower

  • Parent/child

Whitelist, BlackList

  • allowlist/denylist

  • allowlist/blocklist

  • allowedNoned/deniedNouns

  • allow/block

Git

Git Init Repo

Git > 2.28:

$ mkdir ~/.git-template
$ echo "ref: refs/heads/main" > ~/.git-template/HEAD
$ git config --global init.templateDir ~/.git-template
$ git init

Git <= 2.28:

$ git config --global init.defaultBranch main
$ git init

GitHub Migration

GitHub now defaults to main for the default branch when creating new repositories.

Change/migrate existing repo’s default branch:

  1. Navigate to repo’s main page

  2. Click on branches above file list

  3. Click the pencil icon to the right of the master branch

  4. Enter main

  5. Click Rename branch

Update a local clone after master branch has been renamed:

$ git branch -m master main
$ git fetch origin
$ git branch -u origin/main main

References

  1. Inclusive Naming Initiative

  2. INI Word List

  3. IETF Knodel Terminology

  4. GitHub Rename Master Branch

  5. Make git default to main