set -euxo pipefail
# this post is a valid bash script
# A live version of this script lives at
# common aliases
# First a few from the git book that everyone seems to use
git config --global alias.co checkout
git config --global alias.br branch
git config --global alias.ci commit
git config --global alias.st status
git config --global alias.unstage 'reset HEAD --'
git config --global alias.last 'log -1 HEAD'
# my own aliases that also seem common
git config --global alias.cp cherry-pick
git config --global alias.oops 'commit --amend --no-edit'
# Consistent commands to list all branches, tags, stashes, worktrees, remotes, and aliases
# Friendly wording is easier to remember.
# Thanks to http://gggritso.com/human-git-aliases
git config --global alias.branches 'branch --all'
git config --global alias.tags 'tag'
git config --global alias.stashes 'stash list'
git config --global alias.worktrees 'worktree list'
git config --global alias.remotes 'remote -v'
git config --global alias.aliases 'config --get-regexp ^alias\.'
# Better defaults
# git has some amazing hidden features and some terrible default configuration choices that everyone seems to change. In this section, I’m trying to only list those, and avoid personal preferences. You can think of these as bad defaults in git that ought to be changed.
# If you use different email addresses to commit to different git repositories on the same computer, it's best to avoid setting a global user.email or it's too easy to make mistakes. Git also tries to infer your email address as user@host in some situations.
# Now you can tell Git not to guess, but rather to insist that you set user.name and user.email explicitly before it will let you commit:
git config --global user.useConfigOnly true
# Ensure that Git is properly configured to handle line endings. On OS X, you simply pass input to the configuration.
git config --global core.autocrlf input
# Git should detect both renames and copies. Theoretically slows down git.
git config --global diff.renames copies
# Diffs of submodules should show the changed contents rather than a list of commits.
git config --global diff.submodule diff
# git diff should use a prefix pair that is different from the standard "a/" and "b/" depending on what is being compared. Only relevant when not piping through diff-so-fancy.
git config --global diff.mnemonicPrefix true
# When running git diff --color-words, git uses this regex to determinate word boundaries.
git config --global diff.wordRegex .
# git status should show a summary of commits for modified submodules.
git config --global status.submoduleSummary true
# The git rerere functionality is a bit of a hidden feature. The name stands for "reuse recorded resolution" and, as the name implies, it allows you to ask Git to remember how you've resolved a hunk conflict so that the next time it sees the same conflict, Git can resolve it for you automatically.
git config --global rerere.enabled true
# git rerere should update the index, not just the worktree.
git config --global rerere.autoUpdate true
# When a new branch is created with git branch or git checkout that tracks another branch, git should set up pull to rebase instead of merge.
git config --global branch.autoSetupRebase always
# git should always set up tracking for new branches, not just for remote branches.
# true: automatic setup is done when the starting point is a remote-tracking branch;
# always: automatic setup is done when the starting point is either a local branch or remote-tracking branch;
git config --global branch.autoSetupMerge always
# git should delete the .orig file after merge conflicts are resolved. It seems safer to keep the backup files, but git has so many other ways to recover work.
git config --global mergetool.keepBackup false
# Automatically correct and execute mistyped commands after waiting for the given number of deciseconds (0.1 sec). For example:
# git helo
# WARNING: You called a Git command named 'helo', which does not exist.
# Continuing in 2.0 seconds, assuming that you meant 'help'.
git config --global help.autoCorrect 20
# git fetch should unconditionally recurse into submodules
git config --global fetch.recurseSubmodules true
# git push should recurse into submodules on-demand
# all submodules that changed in the revisions to be pushed will be pushed
git config --global push.recurseSubmodules on-demand
# there is no configuration available to tell git to always use `force-with-lease` instead of `force`
git config --global alias.pushf "push --force-with-lease"
# git should create a temporary stash entry before a rebase and apply it after the rebase ends. This means that you can run rebase on a dirty worktree. However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts. This option can be overridden by the --no-autostash and --autostash options of git-rebase.
git config --global rebase.autoStash true
# Print out the ref names of any commits that are shown by the log command. If short is specified, the ref name prefixes refs/heads/, refs/tags/ and refs/remotes/ will not be printed. If full is specified, the full ref name (including prefix) will be printed. If auto is specified, then if the output is going to a terminal, the ref names are shown as if short were given, otherwise no ref names are shown. This is the same as the --decorate option of the git log.
git config --global log.decorate full
# git stash show (without an option) should show the stash entry in patch form.
git config --global stash.showPatch true
# git rebase --interactive should print a warning and stop the rebase if commits are removed (e.g. a line was deleted). To drop a commit without warning or error, use the drop command in the todo list. To proceed after an error, use git rebase --edit-todo.
git config --global rebase.missingCommitsCheck error
# Performance optimizations
git config --global pack.useSparse true
git config --global core.commitGraph true
git config --global gc.writeCommitGraph true
git config --global fetch.writeCommitGraph true
# Redundant config
# In the past, git has had some terrible default options that were fixed in later versions. If you are like me, you have some now-redundant configuration and can’t remember why. These — unset commands can clean up some configuration that is no longer necessary assuming you’re on a reasonably modern version of git. Be careful though, these commands do not check that your configuration is in fact redundant.
# Defines the action git push should take if no refspec is explicitly given.
# Since Git 2.0, simple is the new default.
git config --global --unset push.default
# A boolean to make git-clean do nothing unless given -f, -i or -n. Defaults to true.
git config --global --unset clean.requireForce
# Use colors in output. Always, never, or auto when writing to terminal. auto is the default since Git 1.8.4.
git config --global --unset color.ui