Skip to content

Instantly share code, notes, and snippets.

@adoyle-h
Created June 5, 2016 11:50
Show Gist options
  • Save adoyle-h/c02c61e6f5044a2d299996fb4f615c97 to your computer and use it in GitHub Desktop.
Save adoyle-h/c02c61e6f5044a2d299996fb4f615c97 to your computer and use it in GitHub Desktop.
.gitconfig
[user]
name = ADoyle
email = [email protected]
[color]
ui = true
[core]
editor = nvim
excludesfile = ~/.gitignore
autocrlf = input
safecrlf = true
[alias]
logg = log --left-right --graph --format=\"%C(auto)%d %h%Creset% s %C(68)%ar %C(ul 117)%aN|%cN%Creset\"
logga = log --all --left-right --graph --format=\"%C(auto)%d %h%Creset% s %C(68)%ar %C(ul 117)%aN|%cN%Creset\"
f = fetch --prune
b = branch -vv
find = grep -n --heading --break
findn = grep -n
grepn = grep -n
c = commit -v
ca = commit --amend -v
caq = commit --amend --no-edit
a = add -v .
d = diff --word-diff=color
d-maybe-best = diff --color-words='[A-z0-9_\\.]+|[^[:space:]]'
s = status -s -b
loggas = log --simplify-by-decoration --all --left-right --graph --format=\"%C(auto)%d %h%Creset% s %C(68)%ar %C(ul 117)%aN|%cN%Creset\"
loggs = log --simplify-by-decoration --left-right --graph --format=\"%C(auto)%d %h%Creset% s %C(68)%ar %C(ul 117)%aN|%cN%Creset\"
children = !"git b --contains"
parent = !"git show-branch | grep '*' | grep -v develop | head -1 | awk -F'[]~^[]' '{print }'"
conflicts = diff
ign = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
server = !git daemon --reuseaddr --base-path=.git --export-all --verbose
init-repo = commit -m \"init repo\" --allow-empty
dl = clone --single-branch --depth 1
download = clone --single-branch --depth 1
findw = grep -W -n --heading --break
conf-fake-user = "!conf_fake_user() { git config user.name \"$1\" && git config user.email \"[email protected]\" ;}; conf_fake_user "
show-user = config --show-origin --get-regexp \"user.(name)|(email)\"
[push]
default = current
[pull]
rebase = true
[gui]
encoding = utf-8
[i18n]
commitencoding = utf-8
logoutputencoding = utf-8
[diff]
tool = ksdiff
submodule = log
[difftool "ksdiff"]
cmd = ksdiff -w $LOCAL $REMOTE
[mergetool "ksdiff"]
cmd = ksdiff -w $BASE $LOCAL $REMOTE $MERGED
[difftool "sourcetree"]
cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[rerere]
enabled = true
[rebase]
stat = true
autoSquash = true
[merge]
log = true
ff = false
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
;[http]
; proxy = socks5://127.0.0.1:1080
;[https]
; proxy = socks5://127.0.0.1:1080
[status]
submoduleSummary = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment