-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
139 lines (117 loc) · 3.72 KB
/
gitconfig
File metadata and controls
139 lines (117 loc) · 3.72 KB
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
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
# vim: set ft=gitconfig :
[core]
excludesfile = ~/.gitignore
autocrlf = input
trustctime = false
[alias]
s = status
b = branch
t = tag
ba = branch -a -v -v
bs = !git-branch-status
bsi = !git-branch-status -i
ci = commit
co = checkout
last = log -1 HEAD
chp = cherry-pick
d = diff -C
ds = diff -C --stat
dsp = diff -C --stat -p
dw = diff -C --color-words
l = log -C --decorate
ls = log -C --stat --decorate
lsp = log -C --stat -p --decorate
lg = log --graph '--pretty=tformat:%Cblue%h%Creset %Cgreen%ar%Creset %Cblue%d%Creset %s'
lga = log --graph '--pretty=tformat:%Cblue%h%Creset %Cgreen%ar%Creset %Cblue%d%Creset %s' --all
l19 = log --graph '--pretty=tformat:%Cblue%h%Creset %Cgreen%ar%Creset %Cblue%d%Creset %s' --all -19
# для сложных ветвлений
# lsd = log --graph '--pretty=tformat:%Cblue%h%Creset %Cgreen%ar%Creset %Cblue%d%Creset %s' --all --simplify-by-decoration
# ru = remote update
# sb = show-branch --sha1-name
# ls-del = ls-files -d
# ls-mod = ls-files -m # включая удалённые файлы
# ls-new = ls-files --exclude-standard -o
# ls-ign = ls-files --exclude-standard -o -i
# ka = !gitk --all
# kdo = !gitk --date-order
# kado = !gitk --all --date-order
# kasd = !gitk --all --simplify-by-decoration
meld = !/home/asux/git-meld/git-meld.pl
[color]
branch = auto
status = auto
grep = auto
diff = auto
ui = auto
[user]
name = Oleksandr Ulianytskyi
email = a.ulyanitsky@gmail.com
signingKey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCmN/ve2I6K6rcgGEmX08TvKOruDlWi4Tdm97DfV8HXvNoESj4r+WhKbhtZe+rcjx4n4cSK6+Dwm0YtX+uc3p8FL1Bi6e8rVfv3lPu/mqJymsf9DKxBunPyVDd5kds1wd+EJ34TrwTHRhhU6kPBW658mGRPI9aCygqZEkVl5JeOcXHDVLb3ud3+pADZ8LVGwcuByRuW0WRTk11CNIrdbZIv2J263rxucTC+hyw7YDNYWQziUrTIQRpknx58a8Jq7TDSWZ0EgMdTQUoNDcl8DOgNLvI37QHXed/zB/HqEhvyMOGGKcD+aQJeefVOz+AwHW9+fu6hgCaLzAftAxfAtuUCd74jR6y1Uo9nawXoEbztrY5qKAiq93ChWab4g77bSOdoNRyMW80msvfy0/17BhRSCseXGejvATCBw4GDp8sRFmSPLP/LQl3Wawwj1t5x7Gv9rm0wR95hXXZMfnxpXc4KbGqY4yTraqxejVjNVx/NP2b43Wq7TL7z5l0wAOQp5cM
[giggle]
main-window-maximized = true
main-window-geometry = 0x0+0+0
[commit]
status = true
template = /Users/asux/.stCommitMsg
gpgSign = true
[difftool "sourcetree"]
cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[push]
default = simple
autoSetupRemote = true
[diff]
tool = Kaleidoscope
[difftool "diffmerge"]
cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
[merge]
tool = Kaleidoscope
[mergetool "diffmerge"]
cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
trustExitCode = true
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
trustExitCode = true
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
keepBackup = true
[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
process = git-lfs filter-process
required = true
[mergetool "smerge"]
cmd = smerge mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
trustExitCode = true
[gui]
editor = nova
[gpg]
program = gpg
format = ssh
[tag]
forceSignAnnotated = true
[pull]
rebase = true
[init]
defaultBranch = main
[credential]
helper = osxkeychain
[gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
allowedSignersFile =