-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
82 lines (81 loc) · 2.78 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
[user]
email = [email protected]
name = Theodor René Carlsen
[gui]
encoding = utf-8
[init]
defaultBranch = main
[core]
quotepath = off
autocrlf = input
excludesfile = /home/theodorc/.gitignore
[alias]
trace = blame
alias = !git config --get-regexp ^alias
amend = commit --amend --no-edit
b = branch --sort=-committerdate
bc = switch -c
c = commit -a
cm = commit -m
co = checkout
coz = !git branch --sort=-committerdate | fzf | xargs git checkout
dft = difftool -d
difflock = diff -- . ':(exclude)package-lock.json'
fixup = !git log -n 50 --pretty=format:'%h %s' --no-merges | fzf | cut -c -7 | xargs -o git commit --fixup
p = push
pb = !git push --set-upstream origin HEAD
pf = push --force-with-lease
pl = pull
pr = !gh pr create
prfix = !git commit -a --amend --no-edit && git push --force-with-lease
prunebranches = remote prune origin
prview = !gh pr view --web
rb = rebase
rba = rebase --abort
rbc = rebase --continue
rbd = rebase develop
recentb = "!r() { count=$1; git for-each-ref --sort=-committerdate refs/heads --format='%(refname:short)|%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:magenta)%(authorname)%(color:reset)' --color=always --count=${count:-20} | while read line; do branch=$(echo \"$line\" | awk 'BEGIN { FS = \"|\" }; { print $1 }' | tr -d '*'); ahead=$(git rev-list --count \"origin/develop..${branch}\"); behind=$(git rev-list --count \"${branch}..origin/develop\"); colorline=$(echo \"$line\" | sed 's/^[^|]*|//'); echo \"$ahead|$behind|$colorline\" | awk -F'|' -vOFS='|' '{$5=substr($5,1,70)}1' ; done | ( echo \"ahead|behind||branch|lastcommit|message|author\\n\" && cat) | column -ts'|';}; r"
rid = rebase -i develop --autosquash
st = status
suntracked = !git ls-files --others --exclude-standard | xargs bat
unstage = restore --staged
view = !gh repo view --web
wt = worktree
wta = worktree add
wtd = worktree remove
wtr = worktree remove
root = rev-parse --show-toplevel
[filesystem "N/A|14.0.1|tmpfs"]
timestampResolution = 9000 nanoseconds
minRacyThreshold = 12860 microseconds
[pull]
rebase = true
autoStash = true
[rebase]
autoStash = true
autosquash = true
stat = true
[merge]
conflictstyle = diff3
; tool = meld
[push]
followTags = true
autoSetupRemote = true
[mergetool "vscode"]
cmd = code --new-window --wait $MERGED
[mergetool "meld"]
cmd = meld
[diff]
tool = difft
[difftool]
prompt = false
[difftool "difft"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true
[maintenance]
repo = /home/theodorc/dev/blank/folq_web
[rerere]
enabled = true
[remote "origin"]
prune = true