dotfiles/dot_gitconfig.tmpl at main · hect1c/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
[user]
	name = {{ .name }}
	email = {{ .email }}
{{- if .gpg_signing_key }}
	signingkey = {{ .gpg_signing_key }}
{{- end }}

[init]
	defaultBranch = main

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

[pull]
	rebase = true

[push]
	autoSetupRemote = true
	default = current

[fetch]
	prune = true

[rebase]
	autoStash = true
	committerDateIsAuthorDate = true

[rerere]
	enabled = true

[diff]
	colorMoved = default
	tool = diffmerge

[difftool "diffmerge"]
	cmd = diffmerge \"$LOCAL\" \"$REMOTE\"

[merge]
	conflictstyle = diff3
	tool = diffmerge

[mergetool "diffmerge"]
	cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
	trustExitCode = true

[mergetool]
	keepBackup = false

[delta]
	navigate = true
	light = false
	line-numbers = true
	side-by-side = true

[interactive]
	diffFilter = delta --color-only

[alias]
	# Basic shortcuts
	co = checkout
	ci = commit
	cob = checkout -b
	cm = commit -m
	br = branch
	st = status
	aa = add -A .
	amend = commit --amend -m

	# Branch switching with pull
	dev = !git checkout develop && git pull origin develop
	staging = !git checkout staging && git pull origin staging
	master = !git checkout master && git pull origin master
	main = !git checkout main && git pull origin main

	# Push shortcuts
	po = push origin
	pod = push origin develop
	pos = push origin staging
	pom = push origin master

	# Pull shortcuts
	plo = pull origin
	plod = pull origin develop
	plos = pull origin staging
	plom = pull origin master

	# Log aliases
	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
	ll = log --oneline -n 20
	last = log -1 HEAD --stat

	# Utility
	unstage = reset HEAD --
	undo = reset --soft HEAD~1
	wip = !git add -A && git commit -m 'WIP'
	branches = branch -a
	remotes = remote -v
	contributors = shortlog --summary --numbered

{{- if .gpg_signing_key }}

[commit]
	gpgsign = true

[tag]
	gpgsign = true
{{- end }}