-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
43 lines (43 loc) · 1.44 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
[commit]
gpgsign = true
[user]
email = leo.jpod@lilo.org
name = Leo jPod
signingkey = C7F6D47D5A5F5213
[core]
editor = nvim
[alias]
st = status -sb
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --abbrev-commit --date=relative --all
lgb = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --abbrev-commit --date=relative --ancestry-path origin/master..HEAD
psc = !sh -c \"git push origin $(git rev-parse --abbrev-ref HEAD)\"
pscf = !sh -c \"git push origin $(git rev-parse --abbrev-ref HEAD) --force\"
plc = !sh -c \"git pull origin $(git rev-parse --abbrev-ref HEAD)\"
plo = !sh -c \"git pull origin \"
plcr = !sh -c \"git pull --rebase origin $(git rev-parse --abbrev-ref HEAD)\"
plr = !sh -c \"git pull --rebase \"
di = diff
ci = commit
co = checkout
br = branch
llog = log --date=local
yolo = !git add -A && git commit -m \"$(curl --silent --fail https://whatthecommit.com/index.txt) ~ provided by whatthecommit\"
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[init]
templatedir = ~/.git-templates
defaultBranch = main
[merge]
tool = diffconflicts
[mergetool "diffconflicts"]
cmd = vim -c DiffConflicts \"$MERGED\" \"$BASE\" \"$LOCAL\" \"$REMOTE\"
trustExitCode = true
[mergetool]
keepBackup = false
[pull]
rebase = false
[github]
user = leojpod