-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
32 lines (31 loc) · 1.16 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
[oh-my-zsh]
prefix-length = 0
prefix-regex = [^-]*-
suffix-length = 8
[alias]
slog = log -n 10 --format=format:'%Creset%an %Cgreen%ar:%Creset%s %Cred%h'
ci = !git add -A && git commit
tracking = for-each-ref --format='%(refname:short) <- %(upstream:short)' refs/heads
s = status --short
iml = checkout /Users/daniel.pasch/dev/furniture/.idea/moebel.iml
# current branch
# $ git find-merge <SHA-1>
# specify branch
# $ git find-merge <SHA-1> master
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"
# $ git grep-by-author fix
grep-by-author = "!sh -c 'git log --grep="$1" --format=short -i --no-merges | grep "Author" | sort | uniq -c | sort -r'"
[pull]
rebase = true
[push]
autoSetupRemote = true
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
[init]
defaultBranch = main
[safe]
directory = /mnt/WD1/home/homeassistant