-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
46 lines (46 loc) · 1.01 KB
/
.gitconfig
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
[user]
name = Tim Macfarlane
email = [email protected]
[color]
ui = true
[alias]
co = checkout
st = status
br = branch
l = log -1
sm = submodule update --init --recursive
local = log @{u}..
unpushed = log @{u}..
unreleased = log $(git describe --abbrev=0)..
clean-branches = "!git branch --merged | grep -v '\\*\\|master' | xargs -n 1 git branch -d"
s = stash
sp = stash pop
[push]
default = simple
autoSetupRemote = true
[merge]
conflictstyle = diff3
tool = nvimdiff
[mergetool "vimdiff"]
layout = "BASE,LOCAL + LOCAL,MERGED + BASE,REMOTE + REMOTE,MERGED"
[core]
editor = nvim
trustctime = false
[pull]
rebase = true
[mergetool]
keepBackup = false
prompt = false
[core]
attributesFile = ~/.gitattributes
pager = delta --hyperlinks
excludesfile = ~/.gitignore
[delta]
features = side-by-side line-numbers
syntax-theme = OneHalfDark
[init]
defaultBranch = main
[fetch]
prune = true
[include]
path = ~/.gitconfig.local