-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathdot-gitconfig
138 lines (110 loc) · 3.94 KB
/
dot-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
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
[user]
name = Monique Oliveira
email = lccro@msn.com
; signingkey = 595FABD9E2F0E2C7E53715DB185B193B89DF323E
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINGoZYXiQL1AhybB4cRzzpd5dwhFDDED5P1bKAgU55UD
[core]
quotepath = false
editor = nvim
excludesfile = ~/.gitignore_global
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
autocrlf = input
[diff]
[color]
status = auto
diff = auto
branch = auto
interactive = auto
ui = auto
[fetch]
parallel = 0
[submodule]
fetchJobs = 0
[alias]
aa = add --all
br = branch
ci = commit
co = checkout
commit = commit -v
amend = commit --amend --no-edit
d = diff --color-words --minimal --ignore-space-at-eol -b -w --ignore-blank-lines
dc = diff --cached --color-words --minimal --ignore-space-at-eol -b -w --ignore-blank-lines
df = diff --color-words --ignore-space-at-eol -b -w
h = !git head
head = !git l -1
r = !git l -30
l = log --graph --pretty=format:'%G? %C(auto)%C(blue)%h%C(reset) %C(green)%ar%C(reset) %C(dim white)%an%C(reset)%C(auto)%d%C(reset) %C(bold white)%s%C(reset)'
#l = "!. ~/bin/git_log.sh && default"
l1 = log --graph --all --decorate --pretty='format:%C(blue)%h%C(auto)%d%C(reset) %ar %C(green)%an%C(reset) %s'
l2 = log --graph --all --decorate --oneline
l3 = log --graph --all --pretty=format:'%C(red)%h%C(reset) - %C(green)<%an>%C(reset)%d %C(magenta)%s%C(reset) %C(yellow)(%cr)%C(reset)' --abbrev-commit
l4 = log --graph --all --pretty=format:'%Cred%h%Creset %C(bold blue)%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)' --abbrev-commit
l5 = log --graph --all --pretty=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(bold white)— %an%C(reset)' --abbrev-commit
# diff branch
db = log --graph --pretty=format:'%Cred%h%Creset %C(bold blue)%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)' --abbrev-commit --date=relative
rl = reflog --all --decorate --pretty='format:%C(blue)%h%C(auto)%d%C(reset) %ar %C(green)%an%C(reset) %s'
s = status -sb
sh = show --color-words --minimal
show = show -b
ribbon = tag --force _ribbon origin/master
catchup = log --patch --reverse --topo-order _ribbon..origin/master
statcatchup = log --stat --reverse --topo-order _ribbon..origin/master
showtool = "!sh -c 'REVISION="${1:-HEAD}"; git difftool --dir-diff --no-symlinks $REVISION~ $REVISION' -"
st = showtool
dt = difftool --dir-diff --no-symlinks
ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
[branch "master"]
mergeoptions = --no-ff
[push]
default = current
[gc]
auto = 1
[pull]
rebase = true
[url "git@github.com:"]
insteadOf = gh:
; [url "git@github.com:"]
; insteadOf = https://github.com
; [url "git@gitlab.com:"]
; insteadOf = gl:
; [url "git@gitlab.com:"]
; insteadOf = https://gitlab.com
[url "https://bitbucket.org/"]
insteadOf = bb:
[url "https://github.com"]
insteadOf = git://github.com
[diff]
tool = bc
; tool = Kaleidoscope
; tool = bc3
; algorithm = patience
; wordRegex = [A-z0-9_]+|[^[:space:]]
; context = 5
[merge]
tool = bc
[mergetool "bc"]
trustExitCode = true
[gui]
warndetachedcommit = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[mergetool]
prompt = false
[difftool]
prompt = false
[commit]
; template = ~/.stCommitMsg
gpgsign = true
[gpg]
format = ssh
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
allowedSignersFile = "~/.config/git/allowed-signers"
[init]
defaultBranch = main
; templatedir = ~/.git_template
[rerere]
enabled = true