-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
48 lines (48 loc) · 1.4 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
44
45
46
47
48
[user]
name = Ryder
email = [email protected]
[core]
filemode = true
editor = nvim
pager = diffr | less -R
attributesfile = ~/.gitattributes
autocrlf = input
[interactive]
diffFilter = diffr
[alias]
st = status
ci = commit
co = checkout
rb = rebase
cp = cherry-pick
br = branch
df = diff
pick = cherry-pick
fp = format-patch
ll = log --graph --decorate --pretty=oneline --abbrev-commit --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%ai%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --date=rfc
llm = log --graph --decorate --pretty=oneline --abbrev-commit --all --merges --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%ai%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop\\|main' | xargs -n 1 git branch -d"
[push]
default = simple
[pull]
rebase = true
[merge]
tool = vimdiff
[merge "json"]
name = custom merge driver for json files
driver = git-json-merge %A %O %B
[mergetool]
prompt = false
keepBackup = false
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $MERGED $REMOTE
[diff]
tool = vimdiff
[difftool]
prompt = false
[difftool "vimdiff"]
cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
[log]
date = iso
[url "[email protected]:"]
insteadOf = https://github.com