-
Notifications
You must be signed in to change notification settings - Fork 5
/
Copy path.gitconfig
152 lines (139 loc) · 4.96 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
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
140
141
142
143
144
145
146
147
148
149
150
151
152
[pager]
diff = delta
log = delta
reflog = delta
show = delta
[interactive]
diffFilter = delta --color-only
[delta]
features = side-by-side line-numbers decorations
whitespace-error-style = 22 reverse
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
[user]
name = Viktor Gamov
email = [email protected]
[core]
#autocrlf = input
#safecrlf = true
excludesfile = ~/.gitignore
autocrlf = input
whitespace = trailing-space,space-before-tab
quotepath = false
ignorecase = false
editor = micro
sshCommand = "ssh -F ~/.ssh/config"
# pager = less -FXR
#[pager]
# diff = diff-so-fancy | less --tabs=1,5 -RFX
# show = diff-so-fancy | less --tabs=1,5 -RFXd
[color]
ui = auto
status = auto
branch = auto
[difftool "sourcetree"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge --nosplash \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = true
[alias]
dt = difftool
news = log -p HEAD@{1}..HEAD@{0}
l = "!git log --graph --pretty='tformat:%C(yellow)%h{%C(green)%ar{%C(bold blue)%an{%C(red)%d%C(reset) %s' $* | column -t -s '{' | less -FXRS"
latest = for-each-ref --count=10 --sort=-committerdate --format='%(committerdate:short) %(refname:short)'
ra = !git log --graph --abbrev-commit --date=relative -20 --all --pretty='format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)%Creset' --abbrev-commit
lg2 = log --graph --date-order -C -M --pretty=format:'<%h> %ad [%an] %Cgreen%d%Creset %s' --all --date=short
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
l1 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
l2 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
l3 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
st = status
s = status --short --branch
ci = commit
co = checkout
br = branch
switch = !legit switch \"$@\"
branches = !legit branches
sprout = !legit sprout \"$@\"
unpublish = !legit unpublish \"$@\"
harvest = !legit harvest \"$@\"
sync = !legit sync \"$@\"
publish = !legit publish \"$@\"
graft = !legit graft \"$@\"
br = branch -a
s = status -u -s
cl = log --stat -C -2
c = commit
d = diff --color-words
dh = diff HEAD
dc = diff --staged
dw = diff --word-diff
dcw = diff --color-words
dm = !git diff | mate
dv = !git diff | vim
who = shortlog -s --
ph = push
pl = pull
lp = log -p
lod = log --oneline --decorate
lg = log --graph
lpo = log --pretty=oneline --abbrev-commit --graph --decorate --all
l1 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
l2 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
l3 = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
spull = !git-svn fetch && git-svn rebase
spush = !git-svn dcommit
sync = !git pull && git push
es = !git pull --rebase && git push
lf = log --pretty=fuller
ignorechanges = update-index --assume-unchanged
noticechanges = update-index --no-assume-unchanged
gc-ap = gc --aggressive --prune
listconf = config --global --list
cam = commit -a -m
lsm = log -M --stat
hse = log --stat -5
diffall = diff HEAD
logr = log -M
logr2 = log --stat -M -2
logit = log --stat -M
scrub = !git reset --hard && git clean -fd
#[credential]
# helper = osxkeychain
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[diff]
tool = Kaleidoscope
[difftool]
prompt = false
[difftool "smartsynchronize"]
cmd = /Applications/SmartSynchronize.app/smartsynchronize.sh "$LOCAL" "$REMOTE"
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
keepBackup = true
[merge]
tool = Kaleidoscope
[advice]
statusHints = false
[pull]
rebase = true
[push]
default = nothing
[init]
defaultBranch = main
[commit]
gpgsign = false
[gpg]
program = /usr/local/bin/gpg