-
Notifications
You must be signed in to change notification settings - Fork 4
Expand file tree
/
Copy path.gitconfig
More file actions
155 lines (138 loc) · 5.07 KB
/
.gitconfig
File metadata and controls
155 lines (138 loc) · 5.07 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
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
[user]
name = Alan Norton
email = git@nonration.al
signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDmN/6GdgNQlyyp0FsEVmh3suhU8BCruvS8wxr1z4NCJzG9qQ7VWTwKzo94nc+Wm5FnA5AWt1d/WJWVZroJ1slIOLq0avmWFrhemt+Fk9L5afV3NwcJGZIdhSCZkuaLutkwwpPe9een3QATkCzX85Rg7LjPlzwtO3Sk480SJQnUkSfJY871S0risH5y8Ehm0kjoEx1j684j7lgrv8QmVmn1kJNLSIkhMASm+i36mCgaH7nI5Jqncp81DTUiOdh8I86zJViGQ0n6xQjzvrGrMTV6oyizUJcTuirduBKlESdiWeSH7TQt0xDFDM08tU3i5Eoz6sZaLtWlerA4Jkmv1Kd7GQyIP0K2ShzZBWtiJO31DTp7hpCdDY9o2ZlcX374YcJdZFp1eC5wbn2kLBB5f1/iJQeYWJwmhvM+BTRIvq0HIFdkIwAa2QBQnfAhv+M0wxu1HCAHh3I8mf1bGHJr6oJoTVsrT+/+zfYbU90SOm4sPgsVCzhZUo5QnXRca2MaeEQsrjnqnc8Uqn+NqeWxGc+jdlXkwpldkQGBSrOWAfL+CtMsAtxnQ2qKt6ZSGBL0y2NYvZb0XyLSoOPEHFtQEPe7BYWdK/V914ZGWg3kQSRy0w18/ng+3L5HRZl+6Gjz2dFoAkCwxmEwD2QsWC8NfnGDJ7sLTAMmgtxsnQ9ENDQS4w==
[github]
user = nonrational
[include]
path = ~/.local/.gitconfig
[includeIf "gitdir:~/wrk/**"]
path = ~/wrk/.gitconfig
[gpg]
format = ssh
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
[commit]
gpgsign = true
[core]
# Use custom `.gitignore` and `.gitattributes`
attributesfile = ~/.gitattributes
quotepath = false
excludesfile = ~/.gitignore_global
# Treat spaces before tabs and all kinds of trailing whitespace as an error
# [default] trailing-space: looks for spaces at the end of a line
# [default] space-before-tab: looks for spaces before tabs at the beginning of a line
whitespace = space-before-tab,-indent-with-non-tab,trailing-space
# Make `git rebase` safer on macOS
# More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
trustctime = false
[alias]
# Short Core Commands
st = status
pp = push
ci = commit -v
co = checkout
dc = diff --cached
df = "diff --name-only"
dfo = "!git df $(git opb)"
ri = rebase -i
amend = commit --amend
aa = add --all .
buu = "branch --unset-upstream"
bc = "branch --show-current"
# Fetching from Remotes
opb = "!. ~/.githelpers && remote_origin_primary_branch"
pb = "!. ~/.githelpers && remote_origin_primary_branch | sed 's|origin/||g'"
f = "fetch --tags --force --prune"
up = "!git f && hub sync"
# Branch Management
mov = "branch -m"
bmx = "!. ~/.githelpers && rename_branch_regex"
bcp = "!git branch --show-current | pbcopy"
rio = "!git f && git rebase -i $(git opb)"
# Wildcard Support
aww = "!. ~/.githelpers && add_wildcard"
rww = "!. ~/.githelpers && reset_wildcard"
xww = "!. ~/.githelpers && discard_wildcard"
sww = "!. ~/.githelpers && switch_wildcard"
# List subcategories of unstaged files
mod = "!git ls-files --modified ."
del = "!git ls-files --deleted ."
new = "!git ls-files --others --exclude-standard"
ignored = "!git ls-files --others --ignored --exclude-standard * **/*"
# Manage changes that aren't destined to be committed
regard = update-index --no-assume-unchanged
disregard = update-index --assume-unchanged
dissed = !git ls-files -v | grep ^[a-z] || echo "None"
is-it-just-me = "!$EDITOR .git/info/exclude" # ignore untracked files in this specific repo
# Browse code in a browser
bro = "!. ~/.githelpers && git_browse_web"
pro = "!. ~/.githelpers && git_browse_pull_request"
# Inspect current or recent changes
head = !git r -1
hp = "!. ~/.githelpers && show_git_head"
lt = "!git tag | sort -n -t. -k1,1 -k2,2 -k3,3" # Sort by semantically versioned tags
l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
r = !GIT_NO_PAGER=1 git l -10
ra = !git r --all
b = "!. ~/.githelpers && pretty_git_branch"
bs = "!. ~/.githelpers && pretty_git_branch_sorted"
# List local branches, most recent first
lb = "!. ~/.githelpers && list_branches_by_relative_commit"
lbs = "!. ~/.githelpers && switch_recent_branches_by_index"
lba = "!. ~/.githelpers && switch_all_branches_by_index"
brr = branch --sort=-committerdate
# Keep things tidy
broom = "!. ~/.githelpers && delete_remoteless_branches_interactive"
spring-cleaning = "!. ~/.githelpers && delete_all_my_branches_interactive"
everybody-out = "!. ~/.githelpers && delete_all_others_local_branches"
nuke = "!git reset --hard HEAD && git clean -fd"
# Move fast and commit things
bump = "commit --allow-empty -m'ci-bump'"
wip = commit -v -m'wip'
yolo = !git mod | xargs git add && git commit --allow-empty -m \"$(curl -s https://whatthecommit.com/index.txt)\"
[status]
relativePaths = true
[color]
diff = auto
status = auto
branch = auto
interactive = auto
ui = true
pager = true
[gist]
browse = true
private = true
[hub]
protocol = https
user = nonrational
[pull]
rebase = true
[push]
default = simple
autoSetupRemote = true
[merge]
log = true
keepBackup = false;
tool = smerge
prompt = false
[mergetool "smerge"]
cmd = smerge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
keepTemporaries = false
trustExitCode = false
keepBackup = false
prompt = false
[gc]
auto = 0
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[diff]
renameLimit = 999999
[rebase]
instructionFormat = (%an <%ae>) %s
[advice]
skippedCherryPicks = false