dotfiles/.gitconfig at main · dsas/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
[user]
	name = Dean Sas
    email = dean@deansas.org
[includeIf "hasconfig:remote.*.url:git@github.com:Automattic/**"]
    path = ~/.gitconfig-a8c
[includeIf "hasconfig:remote.*.url:https://github.com/Automattic/**"]
    path = ~/.gitconfig-a8c
[includeIf "hasconfig:remote.*.url:git@github.a8c.com:Automattic/**"]
    path = ~/.gitconfig-a8c
[color]
	ui = auto
[core]
	excludesfile = ~/.gitignore
[alias]
	st = status
	vco = commit --verbose
	localbranches = log --branches --not --remotes --simplify-by-decoration --decorate --oneline
	cherry-pick = cherry-pick -x
	diffc = diff --cached
	conflict-patch = show -m --no-prefix -w -U20 HEAD --
[interactive]
	singlekey = true
[push]
	default = tracking
[rebase]
	autosquash = true
[diff]
	noprefix = true
[merge]
	tool = diffconflicts
[mergetool "diffconflicts"]
	cmd = ~/bin/vim-diff-improved vim $BASE $LOCAL $REMOTE $MERGED
	trustExitCode = false
	keepBackup = false
[pull]
	ff = only
[init]
	defaultBranch = main