Skip to content

Instantly share code, notes, and snippets.

@Aeon
Created August 20, 2016 21:33
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Aeon/a3052e9b3b45a6961ec8c22789d933ab to your computer and use it in GitHub Desktop.
Save Aeon/a3052e9b3b45a6961ec8c22789d933ab to your computer and use it in GitHub Desktop.
git config
[color]
ui = auto
diff = auto
status = auto
branch = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
commit = green bold
frag = magenta bold
old = red bold
new = green bold
whitespace = 9 reverse
[color "status"]
added = yellow
changed = green
untracked = cyan
[core]
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
excludesfile = ~/.gitignore_global
editor = /usr/bin/vim
quotepath = false
autocrlf = input
# insanely beautiful diffs
pager = diff-so-fancy | less --tabs=4 -RFX
[alias]
st = status
ci = commit
br = branch
co = checkout
df = diff
dp = diff --patience
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr by %an)%Creset' --abbrev-commit --date=relative
h = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
us = reset HEAD
dfn = diff --patience --ignore-space-change
squash = !sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -
ri = rebase --interactive --autosquash
g = grep --break --heading --line-number
watch = "!while :; do clear; git status --short --untracked=no; git --no-pager diff --shortstat; sleep 2; done"
permission-reset = "!git diff -p | grep -E \"^(diff|old mode|new mode)\" | sed -e \"s/^old/NEW/;s/^new/old/;s/^NEW/new/\" | git apply"
[diff]
tool = opendiff
compactionHeuristic = true
algorithm = patience
[difftool "opendiff"]
cmd = opendiff $LOCAL $REMOTE -ancestor $BASE -merge $LOCAL
[merge]
tool = opendiff
[rerere]
enabled = true
[branch]
autosetuprebase = always
[push]
default = current
[difftool]
prompt = false
[mergetool]
prompt = false
[grep]
extendRegexp = true
lineNumber = true
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[credential]
helper = osxkeychain
[pager]
log = diff-highlight | diff-so-fancy | less --tabs=4 -RFX
show = diff-highlight | diff-so-fancy | less --tabs=4 -RFX
diff = diff-highlight | diff-so-fancy | less --tabs=4 -RFX
[interactive]
diffFilter = diff-highlight
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = 196 bold 225
newNormal = green bold
newHighlight = green bold 46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment