-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
44 lines (42 loc) · 1.34 KB
/
.gitconfig
File metadata and controls
44 lines (42 loc) · 1.34 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
42
43
44
# This is Git's per-user configuration file.
[user]
name = Linus Rachlis
email = linus@rachlis.net
[core]
autocrlf = input
editor = nvim -u NORC
[merge]
tool = nvim
[mergetool]
keepBackup = false
prompt = true
[mergetool "vscode"]
cmd = code --wait $MERGED
[mergetool "nvim"]
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
[diff]
tool = nvim
[difftool]
prompt = true
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[difftool "nvimdiff"]
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
[alias]
edit-config = config -e --global
show-skipped = !git ls-files -v|grep '^S'
skip = update-index --skip-worktree
no-skip = update-index --no-skip-worktree
show-dead-branches = !git branch -vv | grep 'origin/.*: gone]' | awk '{print $1}'
remove-dead-branches = !git show-dead-branches | xargs git branch -D
fpr = !git fetch --prune && git remove-dead-branches # remove branches deleted upstream
ppr = !git fpr && git merge # remove stale branches and move to latest version of current branch
finished-feature = !git checkout main && git fpr && git merge # go back to main branch, remove deleted branches, pull latest
[grep]
lineNumber = true
[push]
autoSetupRemote = true
[init]
defaultBranch = main
[include]
path = ~/.gitconfig_extra