-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig.mac
76 lines (76 loc) · 2.46 KB
/
.gitconfig.mac
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
[user]
name = Maksim Suslov
email = [email protected]
[color]
ui = true
[core]
ignorecase = false
# editor = /usr/bin/vim
editor = code --wait --new-window
autocrlf = input
quotepath = off
longpaths = true
excludesfile = ~/.gitignore_global
[rebase]
autoStash = false
[fetch]
prune = false
[push]
default = simple
[pull]
ff = only
rebase = false
[diff]
tool = bc
# tool = vimdiff
guitool = bc
renameLimit = 10000
[difftool]
prompt = false
[difftool "bc"]
cmd = /usr/local/bin/bcomp \"$LOCAL\" \"$REMOTE\"
[difftool "vscode"]
cmd = code --wait --new-window --diff \"$LOCAL\" \"$REMOTE\"
[merge]
tool = bc
# tool = kdiff3
# tool = wm
guitool = bc
renamelimit = 10000
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[mergetool "bc"]
cmd = /usr/local/bin/bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[alias]
l = log --oneline --graph
ll = log --graph --abbrev-commit --decorate --date=format:'%Y-%m-%d %H:%M %z' --format=format:\"%C(bold blue)%h%C(reset) %C(bold red)%d%C(reset) %C(white)%s %C(bold cyan)%ad%C(reset) %C(bold green)(%ar)%C(reset) %C(dim white)%an%C(reset)\"
lg = log --graph --abbrev-commit --decorate --date=format:'%a, %Y-%m-%d %H:%M:%S %z' --format=format:\"%C(bold blue)%h%C(reset) - %C(bold cyan)%ad%C(reset) %C(bold green)(%ar)%C(dim white) - %an%C(reset)%C(bold yellow)%d%C(reset)%n%C(white)%s%C(reset)\"
d = diff
# diff-highlight: perl script from git 'contrib'
dh = "!f() { git diff --color=always \"$@\" | diff-highlight | less -R; }; f"
b = branch -vv
s = status -sb
co = checkout
df = diff --name-only
ri = "!sh -c 't=\"${1:-master}\"; s=\"${2:-HEAD}\"; mb=\"$(git merge-base \"$t\" \"$s\")\"; if test \"x$mb\" = x ; then o=\"$t\"; else lm=\"$(git log -n1 --merges \"$t..$s\" --pretty=%H)\"; if test \"x$lm\" = x ; then o=\"$mb\"; else o=\"$lm\"; fi; fi; test $# -gt 0 && shift; test $# -gt 0 && shift; git rebase --interactive \"$o\" \"$@\"'"
su = submodule update --init
cl = clean -dfx
root = rev-parse --show-toplevel
[difftool "sourcetree"]
cmd = /usr/local/bin/bcomp \"$LOCAL\" \"$REMOTE\"
path = -ro
[mergetool "sourcetree"]
cmd = /usr/local/bin/bcomp \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[url "[email protected]:"]
insteadOf = https://github.com/
[url "ssh://[email protected]:7999/"]
insteadOf = https://gitlab.tcsbank.ru/