-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
102 lines (102 loc) · 3.31 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
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
[color]
ui = true
[user]
name = Aaron Lifton
email = [email protected]
signingKey = A5ACD3327CECF3D95AD7E6CC93D3E9320BF8BC47
[alias]
st = status
co = checkout
br = branch -v
brd = "!git branch --sort=-committerdate | head -n 10"
ci = commit
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
lll = "!git ll --pretty=oneline --abbrev-commit"
lds = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
ld = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
le = log --oneline --decorate
filelog = log -u
fl = log -u
dl = "!git ll -1"
dlc = diff --cached HEAD^
grep = grep -Ii
la = "!git config -l | grep alias | cut -c 7-"
r = reset
r1 = reset HEAD^
r2 = reset HEAD^^
rh = reset --hard
rh1 = reset HEAD^ --hard
rh2 = reset HEAD^^ --hard
logtree = log --graph --oneline --decorate --all
brq = "!git branch -v | grep '*'"
glg = log --graph --oneline --all
gla = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --branches
brd2 = "!git branch -v --sort=-committerdate | head -n 20"
sq = "!git reset --soft HEAD~2 && git commit --edit -m \"$(git log --format=%B --reverse HEAD..HEAD@{1})\""
camp = "!git commit -am $1 && git push"
pfwl = push --force-with-lease
pd = pull origin dev
sq2 = "!git add . && git commit -m fixup && git rebase -i HEAD~2"
dsf = "!f() { [ -z \"$GIT_PREFIX\" ] || cd \"$GIT_PREFIX\" && git diff --color \"$@\" | diff-so-fancy | less --tabs=4 -RFXS; }; f"
lp = "log --graph --oneline --all"
logba = "!git log --pretty="format:%at %H" | sort -g | cut -d' ' -f2);"
pager = "diff-so-fancy | less --tabs=4 -RF"
; excludesfile = ~/.gitignore_global
editor = nvim
last = log -1 HEAD
latest = show --name-only --oneline HEAD
down = pull --rebase origin main
up = push -u origin main
save = "!git add -A; git commit ."
uptags = push --follow-tags
downtags = fetch --tags
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
xdsf = !"git -c interactive.diffFilter='less --tabs=4 -RFX' \"$@\" # Don't use DSF"
mre10 = log --oneline --name-only HEAD~10..HEAD
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 11
frag = magenta bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[url "[email protected]:"]
insteadOf = https://github.com/
[delta]
; navigate = true
; features = catppuccin-macchiato
features = tokyonight_moon
side-by-side = false
true-color = always
[core]
editor = nvim
pager = delta
; excludesfile = ~/.config/git/ignore
[interactive]
; diffFilter = diff-so-fancy --patch
diffFilter = delta --color-only
[merge]
tool = nvimdiff
conflictstyle = diff3
[diff]
colorMoved = default
[pull]
rebase = false
[push]
autoSetupRemote = true
default = current
[init]
defaultBranch = main
[protocol "file"]
allow = always
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true