dotfiles/gitconfig at main · joshma/dotfiles · GitHub

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
49
50
51
52
53
54
55
56
57
[core]
    whitespace = trailing-space,space-before-tab
	pager = diff-so-fancy | less --tabs=4 -FRX
[alias]
    lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
    st = status
    cp = cherry-pick
    co = checkout
    ci = commit
    br = branch
    ts = "!git add -A && git commit -m ts"
    res = "!git reset --soft HEAD~1 && git reset && git status"
[user]
    name = Joshua Ma
    email = me@joshma.com
[color]
	ui = true
[merge]
	tool = Kaleidoscope
[difftool "Kaleidoscope"]
    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
    trustExitCode = true
[difftool]
	prompt = false
[mergetool]
	prompt = false
[diff]
	tool = Kaleidoscope
# [pager]
#     log = /usr/local/opt/git/share/git-core/contrib/diff-highlight/diff-highlight | less
#     show = /usr/local/opt/git/share/git-core/contrib/diff-highlight/diff-highlight | less
#     diff = /usr/local/opt/git/share/git-core/contrib/diff-highlight/diff-highlight | less
# 	branch = false
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[pull]
	ff = only
[color "diff-highlight"]
	oldNormal = red bold
	oldHighlight = red bold 52
	newNormal = green bold
	newHighlight = green bold 22
[color "diff"]
	meta = 11
	frag = magenta bold
	func = 146 bold
	commit = yellow bold
	old = red bold
	new = green bold
	whitespace = red reverse
[interactive]
	diffFilter = diff-so-fancy --patch