dotfiles/gitconfig at main · lukerandall/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
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
[user]
	name = Luke Randall
	email = luke.randall@gmail.com

[alias]
	br = branch
	ci = commit
	co = checkout
	cp = cherry-pick
	cpa = cherry-pick --abort
	cpc = cherry-pick --continue
	cps = cherry-pick --skip
	ma = checkout main
	pf = push --force-with-lease
	puhs = push
	pus = push
	ra = rebase --abort
	rc = rebase --continue
	rs = rebase --skip
	st = status
	staged = diff --staged

	current-branch = symbolic-ref --short HEAD
	pra = pull --rebase --autostash
	pruneremote = remote prune origin
	up = rebase --autostash --no-autosquash --empty=drop "origin/main"

	# show staged and unstaged changes (what would be committed with "git commit -a")
	both = diff HEAD
	df = diff --color --color-words --abbrev
	st = status -s
	l = log --graph --pretty=oneline --abbrev-commit --decorate
	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	grog = log --graph --abbrev-commit --decorate --all --format=format:\"%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(dim white) - %an%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset)\"

[branch]
	autosetuprebase = always
  sort = -committerdate

[color]
	branch = auto
	diff = auto
	status = auto
	ui = auto
[color "branch"]
	current = magenta
	local = yellow
	remote = green
[color "diff"]
	meta = yellow
	frag = magenta
	old = red
	new = green
[color "status"]
	added = yellow
	changed = green
	untracked = cyan

[column]
  ui = auto

[commit]
  verbose = true

[core]
	editor = nvim
	excludesfile = ~/.gitignore_global
	pager = delta

[credential]
	helper = osxkeychain

[delta]
	navigate = true
	features = decorations
	line-numbers = true
	syntax-theme = Monokai Extended

[delta "interactive"]
	keep-plus-minus-markers = false

[delta "decorations"]
	commit-decoration-style = blue ol
	commit-style = raw
	hunk-header-decoration-style = blue ol ul
	hunk-header-file-style = blue
	hunk-header-style = file line-number syntax
	line-numbers-zero-style = grey
	line-numbers-minus-style = red
	line-numbers-plus-style = green
	line-numbers-left-format = "{nm:^4}| "

[diff]
	algorithm = histogram
	colorMoved = default
	renames = true
  mnemonicPrefix = true

[difftool]
	prompt = false

[fetch]
  prune = true
  pruneTags = true
  all = true

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

[help]
  autocorrect = prompt

[include]
	path = ./.gitconfig.local

[init]
	defaultBranch = main

[interactive]
	singlekey = true
	diffFilter = delta --color-only

[merge]
	summary = true
	conflictstyle = zdiff3

[pull]
	rebase = true

[push]
  default = simple
  autoSetupRemote = true
  followTags = true

[rebase]
  autoSquash = true
  autoStash = true
  updateRefs = true

[rerere]
  enabled = true
  autoupdate = true

[tag]
  sort = version:refname