[user] email = alan@alanpearce.eu name = Alan Pearce signingkey = 0xAE8625A63F6F8FD5 [color] branch = auto diff = auto status = auto ui = true [push] default = current followTags = true [alias] up = merge FETCH_HEAD st = status -sb ci = commit br = branch co = checkout ready = rebase -i @{u} lasttag = "!sh -c 'git tag --sort=taggerdate | tail -n1'" pending = "!sh -c 'git log --oneline --merges --grep=\"Merge pull request\" ...$(git lasttag)'" lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' ignored = ls-files --others -i --exclude-standard bump = !bmpr [github] user = alanpearce [ghq "ssh://alanpearce.eu/"] vcs = git [includeIf "gitdir:github.com/satoshipay/"] path = config-satoshipay [diff] algorithm = patience [include] path = config.local [rebase] autosquash = true [rerere] enabled = true [diff] tool = icdiff [difftool] prompt = false [difftool "icdiff"] cmd = icdiff --line-numbers $LOCAL $REMOTE [diff "sopsdiffer"] textconf = "sops -d" [gpg] program = gpg [merge "npm-merge-driver"] name = automatically merge npm lockfiles driver = npx npm-merge-driver merge %A %O %B %P