-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
89 lines (79 loc) · 2.33 KB
/
.gitconfig
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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
[user]
name = Piotrek Dąbrowski
email = [email protected]
signingkey = F62C1370
[push]
default = simple
followTags = true
[core]
editor = /usr/bin/vim
fileMode = false
autocrlf = input
[diff]
algorithm = patience
[giggle]
main-window-maximized = false
main-window-geometry = 955x710+1+68
history-view-vpane-position = 402
main-window-view = HistoryView
file-view-vpane-position = 71
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[merge]
tool = mymeld
conflictstyle = diff3
[mergetool "mymeld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE"
[mergetool "icdiff"]
cmd = icdiff --inline-numbers $LOCAL $REMOTE
[alias]
hist = log --pretty=format:'%Cred%h%Creset %C(bold blue)<%an>%Creset%C(yellow)%d%Creset %Cgreen(%cr)%Creset%n%w(80,8,8)%s' --graph
histfull = log --pretty=format:'%Cred%h%Creset %C(bold blue)<%an>%Creset%C(yellow)%d%Creset %Cgreen(%cr)%Creset%n%w(80,8,8)%s%n' --graph --name-status
llog = log --pretty=format:'%C(yellow)%h %Cred%ad %Cblue%an%Cgreen%d %Creset%s' --date=iso
changelog = log --pretty=format:'%Cgreen%d %Creset%s' --date=iso
whois = "!sh -c 'git log -i -1 --pretty=\"format::%an <%ae>\n\" --author=\"$1\"' -"
whatis = show -s --pretty='tformat::%h (%s, %ad)' --date=short
anychanges = !sh -c 'git fetch' && git log --oneline HEAD..origin/$1
anychangesonmaster = !sh -c 'git fetch' && git log --oneline HEAD..origin/master
whoischanging = !sh -c 'git shortlog HEAD..origin/$0'
whoischangingmaster = !sh -c 'git shortlog HEAD..origin/master'
showtags = show-ref --tags
pushtags = push --tags
tagwithdate = !sh -c 'git tag "$0"_$(date "+%y-%m-%d_%H-%M-%S")'
purr = pull --rebase
standup = log --date=relative --graph --since='yesterday'
discard = !sh -c 'git clean -df && git checkout -- .'
unstage = reset --hard HEAD
co = checkout
count = !git shortlog -sn
[apply]
whitespace = nowarn
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[filter "lfs"]
clean = git-lfs clean %f
smudge = git-lfs smudge %f
required = true
[gpg]
program = gpg1
[rerere]
enabled = true