-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
41 lines (36 loc) · 1.19 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
[user]
name = Niek Bruins
email = [email protected]
signingkey = E2DBC587B2B038D8
[push]
default = current
[commit]
gpgsign = false
[gpg]
program = /usr/local/MacGPG2/bin/gpg
[rerere]
enabled = true
[core]
excludesfile = '~/.gitignore-global'
[alias]
pickable = log --oneline --cherry-pick --right-only --reverse
lb = !git reflog show --pretty=format:'%gs ~ %gd' --date=relative | grep 'checkout:' | grep -oE '[^ ]+ ~ .*' | awk -F~ '!seen[$1]++' | head -n 10 | awk -F' ~ HEAD@{' '{printf(\" \\033[33m%s: \\033[37m %s\\033[0m\\n\", substr($2, 1, length($2)-1), $1)}'
fza = "!git ls-files -m -o --exclude-standard | fzf --print0 -m | xargs -0 -t -o git add"
blame = "git blame -w -C -C -C"
[include]
path=.config/git/delta.inc
path=.config/git/vim.inc
[pull]
rebase = true
[mergetool "meld"]
# Choose one of these 2 lines (not both!) explained below.
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
#cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
[merge]
tool = nvim
[maintenance]
repo = /Users/niek/projects/grandvision/gv-core-components
[credential]
helper = /usr/local/share/gcm-core/git-credential-manager
[credential "https://dev.azure.com"]
useHttpPath = true