-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
110 lines (86 loc) · 2.05 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
[init]
defaultBranch = main
templatedir = ~/.config/git/templates
[user]
name = Kirill Klenov
email = [email protected]
editor = nvim
[core]
autocrlf = input
excludesfile = ~/gitignore
filemode=true
pager = /usr/bin/less
sharedRepository=group
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool]
prompt = false
[diff]
tool = vimdiff
[color]
ui = auto
[color "branch"]
current = bold cyan reverse
local = cyan
remote = yellow
[color "diff"]
meta = yellow
frag = cyan
old = red bold
new = green bold
whitespace = red bold reverse
[color "status"]
added = green bold
changed = yellow
untracked = red
nobranch = red bold reverse
[alias]
; Show aliases
alias = !git config --get-regexp alias | sed 's/alias\\.\\([^ ]*\\) \\(.*\\)/\\1\t => \\2/' | sort
; Common abbr
co = checkout
ci = commit
st = status -sb
br = branch
mg = merge --no-ff
ph = push --tags
; View logs and diff
hist = log --graph --pretty="format:%C(yellow)%h%Cred%d\\ %Creset%s\\ %Cgreen[%an]" --all
ls = log --pretty=format:"%C(yellow)%h\\ %Cblue[%cn]\\%Cred%d\\ %Creset%s" --decorate
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --stat
diff = diff --word-diff
dc = diff --cached
; Git flow support
hotfix = flow hotfix
feature = flow feature
release = flow release
; Undo
amend = commit --amend -C HEAD
undo = reset --soft HEAD^
unstage = reset HEAD
uv = commit -am 'Update version'
[github]
user = klen
[push]
default = current
autoSetupRemote = true
[pull]
rebase = true
[rebase]
autoStash = true
[help]
autocorrect = 1
[rerere]
enabled = true
autoUpdate = true
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "main"]
remote = origin
merge = refs/heads/main
[branch "develop"]
remote = origin
merge = refs/heads/develop