Skip to content

Instantly share code, notes, and snippets.

@maclunar
Last active November 17, 2018 08:10
Show Gist options
  • Save maclunar/bfc897cba5e0de2bafd95457b6c496d8 to your computer and use it in GitHub Desktop.
Save maclunar/bfc897cba5e0de2bafd95457b6c496d8 to your computer and use it in GitHub Desktop.
[pull]
rebase = true
[user]
name = Maciej Wilk
email = maclunar@gmail.com
[alias]
aa = add --all
di = diff
dc = diff --cached
amend = commit --amend
ci = commit
co = checkout
st = status
ff = merge --ff-only
pullff = pull --ff-only
noff = merge --no-ff
b = branch
l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
r = !git l -30
ra = !git r --all
[core]
excludesfile = ~/.gitignore
[diff "ansible-vault"]
textconv = ansible-vault view
cachetextconv = false
[merge "ansible-vault"]
name = ansible-vault merge driver
driver = /usr/local/bin/ansible-vault-merge -- %O %A %B %P
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment