-
Notifications
You must be signed in to change notification settings - Fork 3
/
gitconfig
34 lines (34 loc) · 822 Bytes
/
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
[alias]
co = checkout
st = status
empty = commit --allow-empty -m
glog = log --pretty='format:%d %Cgreen%h%Creset %an - %s' --graph
clog = log --pretty='- [x] %h %s'
slog = log --pretty='- %h %s (%an)'
resolve-all-theirs = "!f() { git diff --name-only --diff-filter=U | xargs -I {} sh -c 'git checkout --theirs \"{}\" && git add \"{}\"'; }; f"
[branch]
autosetupmerge = always
autosetuprebase = always
[color]
ui = auto
[commit]
gpgsign = true
[core]
pager = /opt/homebrew/opt/git/share/git-core/contrib/diff-highlight/diff-highlight | less
trustctime = false
[fetch]
prune = true
[gpg]
program = /usr/local/MacGPG2/bin/gpg2
[init]
defaultBranch = main
[merge]
ff = only
[push]
default = current
[rebase]
autosquash = true
[rerere]
enabled = 1
[include]
path = ~/.gitconfig.local