-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
86 lines (70 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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
[user]
name = Harry
email = [email protected]
[core]
editor = vim
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
[color]
diff = auto
status = auto
branch = auto
interactive = auto
pager = true
ui = auto
[alias]
hist = log --graph --oneline --decorate
st = status
co = checkout
sw = switch
bbranch = !git --no-pager branch --sort=committerdate --format='%(color:yellow)%(refname:short) %(color:green)%(committerdate:relative) %(color:blue)[%(authorname)]' --color=always
rreflog = reflog --format='%C(yellow)%h%C(reset) %gs %C(green)%ar%C(reset) %C(blue)[%an]%C(reset)'
wdiff = diff --color-words
subs = submodule update --init --recursive
amend = commit -a --amend --no-edit
stwdiff = diff --staged -w
fpush = push --force-with-lease --force-if-includes
irebase = rebase --interactive
rcont = rebase --continue
ccont = cherry-pick --continue
praise = blame
fetchthis = "!git fetch origin $(git rev-parse --abbrev-ref HEAD)"
pullthis = "!git pull origin $(git rev-parse --abbrev-ref HEAD)"
[push]
default = current
[pull]
rebase = false
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[init]
defaultBranch = main
[blame]
ignoreRevsFile = .git-blame-ignore-revs
[checkout]
defaultRemote = origin
[url "ssh://[email protected]/octoenergy/"]
insteadof = https://github.com/octoenergy/
[fetch]
prune = true
[merge]
conflictStyle = zdiff3
tool = nvimdiff
[diff]
algorithm = histogram
submodule = diff
colorMoved = default
[commit]
verbose = true
[status]
submoduleSummary = false # too verbose for book
[rerere]
enabled = true
[log]
date = iso