blob: d1b2bb2deb579e870aceb7256e6ad6714c3ffdef (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
[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=version:refname | grep \"^v\\?[0-9]\" | 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> %Cred%d%Creset'
ignored = ls-files --others -i --exclude-standard
bump = !bmpr
[github]
user = alanpearce
[ghq "ssh://alanpearce.eu/"]
vcs = git
[includeIf "gitdir:~/projects/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
[bulkworkspaces]
satoshipay = /home/alan/projects/github.com/satoshipay
|