-
Notifications
You must be signed in to change notification settings - Fork 2
/
gitconfig
77 lines (75 loc) · 2.64 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
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
[user]
name = Matt Ellis
email = [email protected]
signingkey = FA6025D54131324B
[core]
excludesfile = ~/dotfiles/gitignore_global
# https://git.kernel.org/pub/scm/git/git.git/tree/contrib/diff-highlight/README
# See also: https://github.com/so-fancy/diff-so-fancy
# and: https://github.com/dandavison/delta
# and: https://github.com/mookid/diffr
#pager = diff-highlight | less -r
#pager = delta
pager = diffr --colors refine-added:none:background:0x33,0x99,0x33:bold --colors added:none:background:0x33,0x55,0x33 --colors refine-removed:none:background:0x99,0x33,0x33:bold --colors removed:none:background:0x55,0x33,0x33 | less -r
autocrlf = input
fsmonitor = true
[feature]
manyFiles = true
[diff]
tool = bc3
colorMoved = default
# difftastic - https://difftastic.wilfred.me.uk/git.html
#external = difft
[difftool]
prompt = false
# git difftool -t difftastic XXX
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[merge]
tool = bc3
# Can't get this to work?
[interactive]
diffFilter = diffr --colors refine-added:none:background:0x33,0x99,0x33:bold --colors added:none:background:0x33,0x55,0x33 --colors refine-removed:none:background:0x99,0x33,0x33:bold --colors removed:none:background:0x55,0x33,0x33
#diffFilter = delta --color-only
[delta]
navigate = true
[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
change-commits = "!f() { VAR=$1; OLD=$2; NEW=$3; shift 3; git filter-branch --env-filter \"if [[ \\\"$`echo $VAR`\\\" = '$OLD' ]]; then export $VAR='$NEW'; fi\" $@; }; f"
outgoing = log --pretty=oneline --abbrev-commit --graph @{u}..
incoming = !git fetch && git log --pretty=oneline --abbrev-commit --graph ..@{u}
[push]
default = simple
autoSetupRemote = true
[color "status"]
header = normal
branch = yellow bold ul
added = green
# updated is a synonym for added, I think
changed = red
untracked = magenta
unmerged = red bold
nobranch = red ul
# Nicer colours from: https://github.com/paulirish/dotfiles/commit/6743b907ff586c28cd36e08d1e1c634e2968893e#diff-4723a3b40361325f6612c40749b696d9R53
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green
newHighlight = green 22
[credential]
helper = osxkeychain
[commit]
gpgsign = true
[pull]
rebase = false
[init]
defaultBranch = main
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
[scalar]
repo = /Users/matt/IdeaProjects/intellij
[maintenance]
repo = /Users/matt/IdeaProjects/intellij