-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
44 lines (33 loc) · 913 Bytes
/
.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
[user]
email = ckeane@ascendanalytics.com
name = Connor Keane
[pull]
rebase = false
[core]
editor = vim
[push]
default = current
autoSetupRemote = true
[core]
pager = delta
excludesFile = ~/.gitignore
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
side-by-side = true
line-numbers = true
[diff]
colorMoved = default
[init]
defaultBranch = main
[alias]
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<<%an>>%Creset' --abbrev-commit --date=relative
cm = commit -m
undo = reset HEAD~1 --mixed
aliases = !git config --get-regexp ^alias\\. | sed -e s/^alias\\.// -e s/\\ /\\ =\\ /
[merge]
tool = meld
[mergetool "meld"]
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
# cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"