blob: b0d56061422c0e57109c1ef314237e38b2b407e5 (
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
|
[user]
email = alan@alanpearce.uk
name = Alan Pearce
[color]
branch = auto
diff = auto
status = auto
ui = true
[push]
default = current
[alias]
up = merge FETCH_HEAD
st = status -sb
ci = commit
br = branch
co = checkout
ready = rebase -i @{u}
lg = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
standup = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --since yesterday --author Alan
ignored = ls-files --others -i --exclude-standard
pr = pull-request
delete-merged = "!sh -c 'git branch --merged | grep -v "\\*" | grep -v master | grep -v dev | xargs -n 1 git branch -d'"
[github]
user = alan@alanpearce.uk
[ghq "ssh://alanpearce.eu/"]
vcs = git
[diff]
algorithm = patience
[include]
path = config.local
[core]
excludesfile = ~/.config/git/ignore
[rebase]
autosquash = true
[rerere]
enabled = true
[diff]
tool = icdiff
[difftool]
prompt = false
[difftool "icdiff"]
cmd = icdiff --line-numbers $LOCAL $REMOTE
|