-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
41 lines (38 loc) · 1.35 KB
/
.gitconfig
File metadata and controls
41 lines (38 loc) · 1.35 KB
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
[user]
email = 5847863+howinator@users.noreply.github.com
name = Howie Benefiel
[commit]
gpgsign = true
[tag]
gpgSign = true
[core]
editor = vim
pager = delta
[push]
default = current
[rerere]
enabled = true
[alias]
lb = "!git reflog show --pretty=format:'%gs ~ %gd' --date=relative | grep 'checkout:' | grep -oE '[^ ]+ ~ .*' | awk -F~ '!seen[$1]++' | head -n 20 | awk -F' ~ HEAD@{' '{printf(\" \\033[33m%s: \\033[37m %s\\033[0m\\n\", substr($2, 1, length($2)-1), $1)}'"
cb = "!git rev-parse --abbrev-ref HEAD"
parent = "!git show-branch | grep '*' | grep -v \"$(git rev-parse --abbrev-ref HEAD)\" | head -n1 | sed 's/.*\\[\\(.*\\)\\].*/\\1/' | sed 's/[\\^~].*//' #"
# todo i'd like to easily rebase onto feature branches. I should get the range of commits from main and take the new branch as a parameter
rebase-onto = "!f() { git rebase --onto \"$1\" \"$(git merge-base --fork-point \"$1\")\" \"$(git rev-parse --abbrev-ref HEAD)\"; }; f"
hud = !git-hud
checkout-pull = "!f() { git checkout \"$2\" && git pull \"$1\" \"$2\"; }; f"
checkout-last-change = "!f() { git checkout \"$(git rev-list -n 1 HEAD^ -- \"$1\")\" -- \"$1\"; }; f"
[pull]
ff = only
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true
side-by-side = true
[merge]
conflictstyle = diff3
[diff]
colorMoved=default
[include]
path = ~/.gitconfig.local
[gpg]
program = gpg