-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig
62 lines (52 loc) · 1.97 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
[user]
name = Kevin Muncie
email = kevin@kmuncie.com
[alias]
lg = log -20 --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
lgl = log --graph --stat --abbrev-commit --decorate --format=format:'%C(bold yellow)%h%C(reset) - %C(bold green)%ar%C(reset)%C(dim green) by %C(reset)%C(bold white)%an%C(reset)%C(dim green) on %aD%C(reset)%C(bold yellow)%d%C(reset)%n''%C(white)%s%C(reset)%n' --all
f = fetch --all --prune
ff = pull --ff-only
st = status -sb
co = checkout
d = diff
ai = add --interactive
aa = add --all
c = commit
# Rebase off common ancestor https://github.com/silvermine/silvermine-info/blob/master/commit-history.md
rca = !git rebase -i $(git merge-base origin/master HEAD) --autosquash
# Show all local branches
brd = "! f() { for k in $(git branch $@ | sed 's/^..//; s/ .*//'); do echo "$(git log -1 --pretty='%Cgreen%ci %Cblue(%cr)%Creset ' $k) $k" ; done | sort -r; }; f"
# List all aliases
la = "!git config -l | grep alias | cut -c 7-"
[color "status"]
added = green
changed = red
untracked = cyan
[merge]
conflictstyle = diff3
[diff]
colorMoved = default
# Tried using histogram but was confusing, try again another time
# algorithm = histogram
[core]
# This uses package https://github.com/dandavison/delta
pager = delta
[interactive]
diffFilter = delta --color-only --features=interactive
[delta]
features = woolly-mammoth decorations
navigate = true # use n and N to move between diff sections
side-by-side = true
line-numbers = true
[delta "interactive"]
keep-plus-minus-markers = false
[delta "decorations"]
commit-decoration-style = blue ol
commit-style = raw
file-style = omit
hunk-header-decoration-style = blue box
hunk-header-file-style = red
hunk-header-line-number-style = "#067a00"
hunk-header-style = file line-number syntax
[include]
path = ~/dotfiles/themes.gitconfig