-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy path.gitconfig
81 lines (81 loc) · 2 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
[alias]
aa = add --all
amend = "!git commit --amend -C HEAD --date=$(date +%Y-%m-%dT%H:%M:%S)"
ap = add --patch
au = add -u
b = branch
bd- = branch -D @{-1}
cb = "!git switch $(git-pick-branch)"
ci = commit -v
conflicts = "!$EDITOR $(git diff --name-only --diff-filter=U)"
d = diff
dc = diff --cached
gone = "!f() { git fetch --all --prune; git branch -vv | awk '/: gone]/{print $1}' | xargs git branch -D; }; f"
l = "ll -12"
la = "ll --all"
ll = "log --graph --pretty='format:%C(yellow)%h %C(green)%ar %C(cyan)%an %C(red)%d %C(reset)%s'"
lt = "ll --simplify-by-decoration"
main-local = "!cat .git/main-local 2>/dev/null || echo 'main'"
p = push -u
pf = push --force-with-lease
rba = rebase --abort
rbc = rebase --continue
s = status -sb
sha = "!git rev-list --max-count 1 HEAD | tr -d '\n' | tee /dev/tty | pbcopy"
ss = diff --shortstat
sw = switch
todo = "!git grep TODO -- $(git diff --name-only ${1:-`git main-local`}...HEAD)"
wd = diff --word-diff
wip = "!f() { git ci --no-gpg-sign -m \"WIP $*\"; }; f"
[color]
ui = auto
[color "diff"]
meta = black bold
[commit]
gpgsign = true
[core]
autocrlf = input
commentchar = ";"
excludesfile = ~/.gitignore
pager = delta
[delta]
minus-style = brightred bold ul normal
minus-emph-style = auto brightred
plus-style = brightgreen bold ul normal
plus-emph-style = auto green
features = side-by-side line-numbers decorations
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
[diff]
colorMoved = zebra
compactionHeuristic = true
[fetch]
prune = true
pruneTags = true
[github]
user = thorncp
[gpg]
program = gpg
[grep]
lineNumber = true
[include]
path = ~/.gitconfig.local
[init]
defaultBranch = main
[interactive]
diffFilter = delta --color-only
[merge]
ff = only
[pull]
rebase = true
[push]
default = current
[rebase]
autosquash = true
[rerere]
enabled = true
[user]
email = chris@thorn.co
name = Chris Thorn