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