-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
51 lines (51 loc) · 1.14 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
[user]
name = Tomer Keren
email = tomer.keren.dev@gmail.com
[diff]
tool = vimdiff
[log]
stat=true
[difftool]
prompt = false
[mergetool "vscode"] # Actually used as a difftool. use by adding --tool=vscode
cmd = code --wait --diff $LOCAL $REMOTE
[alias]
l = log
ch = checkout
master = checkout master
prep = submodule update --init --recursive
start = commit --allow-empty -m ':tada: Initial commit'
open = browse
[core]
pager = delta
excludesfile = ~/.gitignore_global
[status]
short = true
branch = true
[url "git@github.com:"]
insteadOf = gh:
insteadOf = github:
[url "git@github.com:Tadaboody/"]
insteadOf = me:
[url "git@gitlab.com:"]
insteadOf = gl:
insteadOf = gitlab:
[fetch]
prune=true
[push]
# Push by default to the tracked remote branch, not the branch that is named the same (useful for PRs)
default = upstream
[interactive]
diffFilter = delta --color-only
[pull]
rebase = true
autostash = true
[init]
defaultBranch = main
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[merge]
conflictstyle = diff3