clone of my dotfiles.ssp.sh
remove git config
-83
-83
git/gitconfig
-83
git/gitconfig
···
1
-
[user]
2
-
name = sspaeti
3
-
email = simu@sspaeti.com
4
-
[github]
5
-
user = sspaeti
6
-
[core]
7
-
excludesfile = /Users/sspaeti/.gitignore_global
8
-
pager = delta
9
-
[diff]
10
-
tool = nvimdiff #meld
11
-
colorMoved = default
12
-
#nvimdiff
13
-
[difftool]
14
-
prompt = false
15
-
[difftool "meld"]
16
-
cmd = meld "$REMOTE" "$LOCAL"
17
-
[difftool "nvimdiff"]
18
-
cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
19
-
path = /opt/homebrew/bin/nvim
20
-
[difftool "sourcetree"]
21
-
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
22
-
path =
23
-
[mergetool "sourcetree"]
24
-
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
25
-
trustExitCode = true
26
-
[mergetool "nvimdiff"]
27
-
cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
28
-
trustExitCode = true
29
-
[commit]
30
-
template = /Users/sspaeti/.stCommitMsg
31
-
[filter "lfs"]
32
-
clean = git-lfs clean -- %f
33
-
smudge = git-lfs smudge -- %f
34
-
process = git-lfs filter-process
35
-
required = true
36
-
[alias]
37
-
#ga = "!git status --short | peco | awk '{print $2}' | xargs git add"
38
-
#gd = diff
39
-
co = checkout
40
-
ci = commit
41
-
ca = commit -a
42
-
ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)"
43
-
pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)"
44
-
st = status
45
-
br = branch
46
-
ba = branch -a
47
-
bm = branch --merged
48
-
bn = branch --no-merged
49
-
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}"
50
-
hist = log --pretty=format:\"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)\" --graph --date=relative --decorate --all
51
-
llog = log --graph --name-status --pretty=format:\"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset\" --date=relative
52
-
open = "!hub browse"
53
-
type = cat-file -t
54
-
dump = cat-file -p
55
-
find = "!f() { git log --pretty=format:\"%h %cd [%cn] %s%d\" --date=relative -S'pretty' -S\"$@\" | peco | awk '{print $1}' | xargs -I {} git diff {}^ {}; }; f"
56
-
# edit conflicted file on merge
57
-
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"
58
-
# add conflicted file on merge
59
-
add-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"
60
-
[hub]
61
-
protocol = https
62
-
[interactive]
63
-
diffFilter = delta --color-only
64
-
[delta]
65
-
navigate = true # use n and N to move between diff sections
66
-
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
67
-
[merge]
68
-
conflictstyle = diff3
69
-
[color]
70
-
ui = true
71
-
[color "diff-highlight"]
72
-
oldNormal = red bold
73
-
oldHighlight = red bold 52
74
-
newNormal = green bold
75
-
newHighlight = green bold 22
76
-
[color "diff"]
77
-
meta = 11
78
-
frag = magenta bold
79
-
func = 146 bold
80
-
commit = yellow bold
81
-
old = red bold
82
-
new = green bold
83
-
whitespace = red reverse