-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
43 lines (34 loc) · 1.25 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
42
43
[user]
name = c4tz
email = j.zink@outlook.com
[includeIf "gitdir:~/projects/work/"]
path = ~/projects/work/.gitconfig
[alias]
p = "!f(){ git push -u origin $(git rev-parse --abbrev-ref HEAD);};f"
diff = diff --color | diff-so-fancy
s = "!f(){ git reset --soft HEAD~${1} && git commit --edit -m\"$(git log --format=%B --reverse HEAD..HEAD@{1})\";};f"
ls = "!f(){ git log --pretty=format:'%C(yellow)%h %ad%Cred%d %Creset%s%Cblue [%cn]' --graph --decorate --date=relative | nl '-s: ' | more;};f"
sqp = "!f(){ git add -u && git commit -m 'squash' && git reset --soft HEAD~2 && git commit -m\"$(git log --format=%B --reverse HEAD..HEAD@{2})\" && git push -f origin \"$(git rev-parse --abbrev-ref HEAD)\"; };f"
[merge]
tool = meld
conflictstyle = diff3
[mergetool "meld"]
cmd = meld $LOCAL $BASE $REMOTE -o $MERGED --auto-merge
[rerere]
enabled = 1
[pull]
rebase = true
[core]
pager = diff-so-fancy | less --tabs=4 -RFX
[diff-so-fancy]
markEmptyLines = false
changeHunkIndicators = false
stripLeadingSymbols = false
useUnicodeRuler = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[init]
defaultBranch = main