-
Notifications
You must be signed in to change notification settings - Fork 0
/
dot_gitconfig
47 lines (46 loc) · 1.74 KB
/
dot_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
[user]
name = Andrew Spratley
email = [email protected]
signingkey = 737371F502B3013D!
[core]
excludesfile = ~/.gitignore
autocrlf = input
pager = delta
[interactive]
diffFilter = delta --color-only
[push]
default = simple
autoSetupRemote = true
[pull]
rebase = false
ff = only
[delta]
navigate = true # use n and N to move between diff sections
side-by-side = true
[diff "sopsdiffer"]
textconv = sops -d
[diff]
colorMoved = default
algorithm = histogram
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[init]
defaultBranch = master
[merge]
conflictstyle = diff3
tool = meld
[mergetool "meld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
[alias]
slog = log --graph --decorate --pretty=oneline --abbrev-commit
recentb = "!r() { refbranch=$1 count=$2; 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 \"${refbranch:-origin/master}..${branch}\"); behind=$(git rev-list --count \"${branch}..${refbranch:-origin/master}\"); 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"
fixup = "!git log -n 50 --pretty=format:'%h %s' --no-merges | fzf | cut -c -7 | xargs -o git commit --fixup"
[commit]
gpgSign = true
[tag]
gpgSign = true
[rebase]
autosquash = true