-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
61 lines (61 loc) · 1.6 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
[user]
name = Sokolov Innokenty
email = [email protected]
signingkey = E86D63F398C11C27
[core]
editor = vim
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
quotepath = false
;compression = 0
[color]
ui = auto
diff = auto
status = auto
branch = auto
interactive = auto
[alias]
co = checkout
ci = commit
st = status
br = branch
bra = branch -av
dt = difftool
a = add
ad = add
hist = log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
histpath = log -p -M --follow --stat --
aliases = !git config --list | grep 'alias\\.' | sed 's/alias\\.\\([^=]*\\)=\\(.*\\)/\\1\\ \t => \\2/' | sort
pyll = pull
pul = pull
pus = push
psh = push
puish = push
pysh = push
loh = log
[push]
default = simple
[fetch]
prune = true
[merge]
tool = idea
[mergetool "idea"]
cmd = idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
trustExitCode = true
[diff]
tool = idea
wsErrorHighlight = all
renameLimit = 5127
[difftool]
prompt = false
[difftool "idea"]
cmd = idea merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
trustExitCode = true
[credential]
helper = store
[pull]
ff = only
;rebase = true
[commit]
gpgsign = true
[init]
defaultBranch = master