-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
39 lines (39 loc) · 1.38 KB
/
.gitconfig
File metadata and controls
39 lines (39 loc) · 1.38 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
[fetch]
prune = true
pruneTags = true
[user]
name = primeapple
email = toni.mueller.web@mailbox.org
[init]
defaultBranch = main
templatedir = ~/.git-templates
[alias]
root = rev-parse --show-toplevel
publish = push -u origin HEAD
pullother = !git pull origin $1:$1
hide = update-index --assume-unchanged
unhide = update-index --no-assume-unchanged
hidden = !git ls-files -v | grep '^h' | cut -c3-
cleaner = !git clean -nd && read -rsp $'Press any key to continue...\n' -n 1 key && git clean -fd
# this alias doesn't always work, however printing the command works
# current-merge-base = !git merge-base $1 $(git branch --show-current)
reset-origin=reset --hard @{u}
squash = !git -c sequence.editor=\"nvim -c '2,\\$s/^pick/squash/'\" rebase --interactive $(git merge-base HEAD $(git rev-parse --verify --quiet master >/dev/null && echo master || echo main))
select = !git ls-files -m -o --exclude-standard | zf | xargs --no-run-if-empty git add
last = !git log --all --author=\"$(git config user.name)\" -1 --format=\"%H\"
[core]
pager = delta
[interactive]
diffFilter = delta --color-only
[add.interactive]
useBuiltin = false # required for git 2.37.0
[delta]
navigate = true # use n and N to move between diff sections
dark = true
side-by-side = true
[merge]
conflictstyle = zdiff3
[diff]
colorMoved = default
[pull]
ff = only