-
Notifications
You must be signed in to change notification settings - Fork 9
/
Copy pathgitconfig
64 lines (49 loc) · 1.21 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
[diff]
tool = vimdiff
submodule = log
[status]
submodulesummary = 1
[alias]
l = log --graph --pretty=format:'%Cred%h %Cgreen%ad%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%aN>%Creset' --abbrev-commit --date=format:%F --author-date-order
lg = !git l --all
slg = !git l --simplify-by-decoration
stat = status
st = status
ff = merge --ff-only
index = diff --cached
[core]
excludesfile = ~/.config/config_dir/gitignore
whitespace = space-before-tab
pager = "diff-so-fancy-if-exists | less --tabs=4 -RFX"
[init]
defaultBranch = main
[commit]
verbose = true
[pull]
ff = only
[rebase]
autoSquash = true
[merge]
conflictstyle = diff3
[mergetool "tabbedmeld"]
cmd = meld $LOCAL $BASE $REMOTE -o $MERGED --diff $BASE $LOCAL --diff $BASE $REMOTE
[mergetool "fugitive"]
cmd = vim -f -c Gdiff $MERGED
[svn]
rmdir = true
[url "[email protected]:"]
pushInsteadOf = https://github.com/
pushInsteadOf = git://github.com/
[color.diff-highlight]
oldNormal = "red"
newNormal = "green"
oldHighlight = "red bold 52"
newHighlight = "green bold 22"
[color.diff]
old = "red bold"
new = "green bold"
meta = "yellow"
frag = "magenta bold"
commit = "yellow bold"
[include]
path = ~/.gitconfig.local