-
-
Notifications
You must be signed in to change notification settings - Fork 0
/
dot_gitconfig.tmpl
176 lines (167 loc) · 4.74 KB
/
dot_gitconfig.tmpl
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
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
# https://git-scm.com/docs/git-config
## Aliases
[alias]
# View abbreviated SHA, description, and history graph of the latest 20 commits
l = log --oneline -n 20 --graph --decorate
# View the current working tree status using the short format
stat = status -s
# Show the diff between the latest commit and the current state
d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
# `git di $number` shows the diff between the state `$number` revisions ago and the current state
di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d"
# Commit all changes
ca = !git add -A && git commit -av
# Switch to a branch, creating it if necessary
go = checkout -B
# Show verbose output about tags, branches or remotes
tags = tag -l
branches = branch --all
remotes = remote --verbose
# Credit an author on the latest commit
credit = "!f() { git commit --amend --author \"$1 <$2>\" -C HEAD; }; f"
# Amend the currently staged files to the latest commit
amend = commit --amend --reuse-message=HEAD
# Interactive rebase with the given number of latest commits
reb = "!r() { git rebase -i HEAD~$1; }; r"
# Remove branches that have already been merged with main
clear = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
pr = "!f() { git fetch -fu ${2:-origin} refs/pull/$1/head:pr/$1 && git checkout pr/$1; }; f"
## System Wide
[core]
autocrlf = input
eol = lf
# Treat spaces before tabs and all kinds of trailing whitespace as an error
# [default] trailing-space: looks for spaces at the end of a line
# [default] space-before-tab: looks for spaces before tabs at the beginning of a line
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
ignoreCase = false
# Use custom `.gitignore` and `.gitattributes`
excludesfile = ~/.gitignore
# Make `git rebase` safer on macOS
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
trustctime = false
# Prevent showing files whose names contain non-ASCII symbols as unversioned.
# http://michael-kuehnel.de/git/2014/11/21/git-mac-osx-and-german-umlaute.html
precomposeunicode = false
# Speed up commands involving untracked files such as `git status`.
# https://git-scm.com/docs/git-update-index#_untracked_cache
untrackedCache = true
editor = code --wait
{{- if not .codespaces }}
pager = delta
[interactive]
diffFilter = delta --color-only --features=interactive
{{- end }}
[delta]
side-by-side = true
hyperlinks = true
hyperlinks-file-link-format = "vscode://file/{path}:{line}"
[delta "interactive"]
keep-plus-minus-markers = false
[protocol]
version = 2
[init]
defaultBranch = main
[apply]
whitespace = fix
[help]
autoCorrect = prompt
{{- if not .codespaces }}
## Local Workflow
[user]
{{- if .name }}
name = {{ .name }}
{{- end }}
{{- if .email }}
email = {{ .email }}
{{- end }}
{{- if .signingkey }}
signingKey = {{ .signingkey }}
{{- else }}
signingKey = ~/.ssh/id_ed25519.pub
{{- end }}
[tag]
forceSignAnnotated = true
[commit]
gpgSign = true
[gpg]
{{- if .signingkey }}
{{- if eq .chezmoi.os "windows" }}
program = "C:\\Program Files (x86)\\gnupg\\bin\\gpg.exe"
{{- end }}
{{- else }}
format = ssh
{{- end }}
{{- end }}
[diff]
#external = difft
# Detect copies as well as renames
renames = copies
algorithm = histogram
context = 10
[diff "bin"]
# Use `hexdump` to diff binary files
textconv = hexdump -v -C
## Push-Pull & Protocol Related
[push]
# Make `git push` push relevant annotated tags when pushing branches out.
followTags = true
recurseSubmodules = check
default = current
[pull]
rebase = true
[rebase]
autosquash = true
autostash = true
missingCommitsCheck = error
updateRefs = true
[merge]
conflictStyle = zdiff3
[transfer]
fsckobjects = true
[fetch]
fsckobjects = true
prune = true
prunetags = true
[receive]
fsckobjects = true
## Remotes
[remote "upstream"]
fetch = +refs/heads/*:refs/remotes/upstream/*
{{- if not .codespaces }}
[url "git@gitlab.com:"]
insteadOf = "gitlab:"
pushInsteadOf = "git://gitlab.com/"
pushInsteadOf = "https://gitlab.com/"
[url "git@github.com:"]
insteadOf = "github:"
pushInsteadOf = "git://github.com/"
pushInsteadOf = "https://github.com/"
[url "git@gist.github.com:"]
insteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
pushInsteadOf = "https://gist.github.com/"
{{- end }}
## Plugins
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
## Colors
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold # line info
old = red # deletions
new = green # additions
[color "status"]
added = yellow
changed = green
untracked = cyan
## Tools
[ghq]
root = ~/projects