dotfiles/.gitconfig at master · aryounce/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
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
[user]
	name = <Name>
	email = <Email>

[core]
	excludesfile = ~/.gitignore-global
	autocrlf = input
	safecrlf = true
	whitespace = fix,space-before-tab,tab-in-indent,trailing-space
	quotepath = false

[pager]
	diff = diff-so-fancy | less --tabs=1,5 -RFX
	show = diff-so-fancy | less --tabs=1,5 -RFX

[log]
	date = format-local:%a %B %d, %Y @ %r [%Z]
	decorate = full

[alias]
	ll = log --name-status
	l1 = log --name-status -n 1

	#
	# Checkout using fzf for branch selection
	#
	co = "!git checkout $(git branch --format=\"%(if:notequals=*)%(HEAD)%(then)%(refname:short)%(end)\" | sed '/^[[:space:]]*$/d' | fzf +i --cycle --height ~20% --pointer='→')"

	cm = commit
	df = diff
	dt = difftool
	dts = difftool --staged
	dc = diff --cached
	s = status
	bd = branch -d
	bD = branch -D

	#
	# List branches, sorted by last committed date, displaying top-line commit message.
	#
	b = branch --sort=-creatordate --color=auto \
		--format='%(color:green)%(HEAD)%(color:reset) %(if:notequals=*)%(HEAD)%(then)%(color:dim)%(else)%(color:default)%(end)%(align:40)%(refname:short)%(end) %(align:25)%(color:yellow)%(committerdate:relative)%(end)%(color:default)%(objectname:short) %(contents:lines=1)%(color:reset)'

	#
	# List branches, sorted by last committed date, displaying tracking branch.
	#
	bt = branch --sort=-creatordate --color=auto \
		--format='%(color:green)%(HEAD)%(color:reset) %(if:notequals=*)%(HEAD)%(then)%(color:dim)%(else)%(color:default)%(end)%(align:40)%(refname:short)%(end) %(align:25)%(color:yellow)%(committerdate:relative)%(end) %(color:default)%(objectname:short) %(color:blue)%(upstream:remoteref) %(color:magenta)%(upstream:track)%(color:reset)'

[color "diff"]
	meta = yellow bold
	frag = magenta bold
	old = red bold
	new = green bold

[push]
	default = nothing

[init]
	defaultBranch = main

[url "git@github.com:"]
	insteadOf = https://github.com/

[diff]
	tool = Kaleidoscope

[difftool "Kaleidoscope"]
	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"

[difftool]
	prompt = false
	trustExitCode = true

[merge]
	tool = Kaleidoscope

[mergetool "Kaleidoscope"]
	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
	trustExitCode = true

[mergetool]
	prompt = false

[filter "lfs"]
	process = git-lfs filter-process
	required = true
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f