-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
51 lines (51 loc) · 1.68 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
[alias]
s = status
c = commit
b = branch
co = checkout
ph = "!f() { branch=`git rev-parse --abbrev-ref HEAD`; git push origin $branch; }; f"
phf = "!f() { branch=`git rev-parse --abbrev-ref HEAD`; git push origin $branch -f; }; f"
pl = "!f() { branch=`git rev-parse --abbrev-ref HEAD`; git pull origin $branch; }; f"
plr = "!f() { branch=`git rev-parse --abbrev-ref HEAD`; git pull --rebase origin $branch; }; f"
pdb = "!f() { branch=`git rev-parse --abbrev-ref HEAD`; git push origin :$branch; }; f"
r = rebase
ra = rebase --abort
ma = merge --abort
rc = rebase --continue
pr = "!f() { branch=`git rev-parse --abbrev-ref HEAD`; git pull --rebase origin $branch; }; f"
tree = forest --pretty=format:\"%C(red)%h %C(magenta)(%ar) %C(blue)%an %C(reset)%s\" --style=15 --reverse --all --no-rebase
unstage = reset HEAD --
sync = "!f() { branch=`git rev-parse --abbrev-ref HEAD`; git pull --rebase origin $branch; git co master; git pull; git co $branch; git rebase master; }; f"
d = "!f() { [ \"$GIT_PREFIX\" != \"\" ] && cd "$GIT_PREFIX"; git diff --color $@ | diff-so-fancy | less --tabs=4 -RFX; }; f"
mt = mergetool
[color]
ui = auto
[user]
name = Denis Kolesnikov
email = [email protected]
[core]
excludesFile = ~/.gitignore
editor = vim
[push]
default = simple
[github]
user = exdis
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
[pull]
rebase = false
[init]
defaultBranch = main
[merge]
tool = vimdiff
[mergetool]
prompt = true
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $MERGED $REMOTE
[difftool]
prompt = false
[diff]
tool = vimdiff