-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathdot_gitconfig
More file actions
93 lines (79 loc) · 2.65 KB
/
Copy pathdot_gitconfig
File metadata and controls
93 lines (79 loc) · 2.65 KB
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
87
88
89
90
91
92
93
[user]
email = git@nicholaschiang.com
name = "Nicholas Chiang"
[core]
editor = nvim
pager = delta
[delta]
syntax-theme = Solarized (dark)
line-numbers = true
[interactive]
diffFilter = delta --color-only
[commit]
gpgsign = false
template = ~/.config/git/.git-commit-template
[pretty]
fixes = Fixes: %Cred%h%Creset (\"%s\")
[alias]
s = status
commit = commit --no-verify
a = commit --amend --no-edit
cm = commit -m
au = add -u
find = log --pretty=\"format:%Cgreen%H %Cblue%s\" --name-status --grep
dfind = log --graph --decorate --stat --date=iso --format=fuller --name-status --grep
co = checkout
ec = config --global -e
up = !git pull --rebase --prune $@ && git submodule update --init --recursive
reset-author = rebase -r -i main --exec \"git commit --amend --no-edit --reset-author\"
cob = checkout -b
undo = reset HEAD~1 --mixed
amend = commit -a --amend
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
save = !git add -A && git commit -m 'SAVEPOINT'
wip = !git add -u && git commit -m "WIP"
purge = !git branch | grep -v "main" | xargs git branch -D
bclean = "!f() { git branch --merged ${1-main} | grep -v " ${1-main}$" | xargs -r git branch -d; }; f"
bdone = "!f() { git checkout ${1-main} && git up && git bclean ${1-main}; }; f"
glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
clog = "!git log --pretty=\"%C(yellow)**%s**%n%Creset%n%b%n---\""
copy = "!git clog main..HEAD | wl-copy"
di = diff --color-words
dic = diff --color-words=.
stats = shortlog -sen --no-merges
flog = log --pretty=fixes
dlog = log --graph --decorate --stat --date=iso --format=fuller
ddlog = log --graph --decorate --stat --date=iso --format=fuller -p
tlog = tag -l -n10
hist = log --follow -p
ignore = update-index --skip-worktree
no-ignore = update-index --no-skip-worktree
p = push
pf = push --force-with-lease
upstream = !git push -u origin HEAD
sba = "!f() { git subtree add --prefix $1 $2 main --squash; }; f"
sbu = "!f() { git subtree pull --prefix $1 $2 main --squash; }; f"
sbp = "!f() { git subtree push --prefix $1 $2 $3; }; f"
[merge]
ff = only
[push]
default = simple
followTags = true
autoSetupRemote = true
[credential]
helper = cache --timeout=7200
[rebase]
autostash = true
[color "status"]
added = green
changed = yellow bold
untracked = red bold
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[includeIf "gitdir/i:~/repos/sophia/"]
path = repos/sophia/.gitconfig
[init]
defaultBranch = main