forked from michaeljsmalley/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathgitconfig
More file actions
165 lines (154 loc) · 5.86 KB
/
Copy pathgitconfig
File metadata and controls
165 lines (154 loc) · 5.86 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
156
157
158
159
160
161
162
163
164
165
[core]
editor = nvim
untrackedCache = true
preloadIndex = true
# Set delta as your main pager with optimized iTerm flags
pager = delta
[interactive]
# Kept clean for interactive operations like `git add -p`
diffFilter = delta --color-only
[delta]
navigate = true # Use n and N to jump between changed files
line-numbers = true
#side-by-side = true # Set to false if you prefer a unified top-to-bottom layout
#syntax-theme = Dracula # Change to your favorite theme (e.g., GitHub, Monokai)
# Remove the loud bounding boxes around file names and hunk headers
file-style = bold # omit
hunk-header-style = omit
# Minimal styling: highlight text foreground only, no background blocks
minus-style = red
minus-non-em-style = red
minus-em-style = red bold underline
plus-style = green
# plus-style = "white #002600"
plus-non-em-style = green
# plus-em-style = green bold underline
plus-emph-style = "white #004d00"
# Clean up line numbers to be compact and quiet
line-numbers = true
line-numbers-minus-style = red
line-numbers-plus-style = green
line-numbers-left-format = "{nm:^4} "
line-numbers-right-format = "{np:^4} "
line-numbers-break-char = " "
# Enable native syntax themes from 'bat' (e.g., GitHub, Monokai, OneHalfDark)
syntax-theme = OneHalfDark
[merge]
conflictStyle = zdiff3
[user]
name = Carlos Alvarez
# email = cead22@gmail.com
email = carlos@expensify.com
# signingkey = 274F78F8018CF180
signingkey = 1B61080A54C0709C
[commit]
gpgsign = true
[github]
user = cead22
[color]
ui = true
[diff]
tool = vimdiff
[difftool]
prompt = false
[color "diff"]
meta = yellow
frag = magenta
old = red
new = green
[alias]
url =! bash -c 'git config --get remote.origin.url | sed -E "s/.+:\\(.+\\)\\.git$/https:\\\\/\\\\/github\\\\.com\\\\/\\\\1/g"'
ap = add -p
st = stash
cv = commit -v
cva = commit -v --amend
cc = commit -v --amend -CHEAD
dc = diff --cached
lg = log --graph --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold white)— %an%C(reset)%C(bold yellow)%d%C(reset)' --abbrev-commit --date=relative
lp = log -p
sl = stash list
conflict = diff --name-only --diff-filter=U
conflicts = diff --name-only --diff-filter=U
pm = pull origin main
db = branch -d
dbf = branch -D
rh = reset --hard HEAD
co = checkout
cb = checkout -b
ri = rebase -i
cp = cherry-pick
sp = stash pop
bg = bisect good
bb = bisect bad
ss = stash save
pb = "!f() { git pull ${1:-origin} `git symbolic-ref HEAD`; }; f"
foc = "!f() { git fetch origin $1; git co $1; }; f"
fc = "!f() { PR_NUMBER=\"$1\"; BRANCH_NAME=\"${2#*:}\"; git fetch origin pull/$PR_NUMBER/head:$BRANCH_NAME; git checkout $BRANCH_NAME; }; f"
np = !git --no-pager
da = !git branch --merged | grep -v "\\*" | xargs -n 1 git branch -d
au = add -u
mb = !git branch | grep carlos
branches = "for-each-ref --sort=committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'"
# typos
dif = diff
difff = diff
shoe = git show
[pull]
rebase = false
[safe]
directory = /vagrant/App
directory = /vagrant/Auth
directory = /vagrant/Bedrock
directory = /vagrant/Bedrock-PHP
directory = /vagrant/Chronos
directory = /vagrant/Comp
directory = /vagrant/Email-Parsers
directory = /vagrant/expensify-common
directory = /vagrant/ExpensifyBackupManager
directory = /vagrant/ExpensifyTableManager
directory = /vagrant/FuzzyBot
directory = /vagrant/Integration-Server
directory = /vagrant/k2-extension
directory = /vagrant/Mobile-Expensify
directory = /vagrant/Ops-Configs
directory = /vagrant/PHP-Libs
directory = /vagrant/react-native-onyx
directory = /vagrant/Salt
directory = /vagrant/Server-Scraper
directory = /vagrant/Server-ScraperJS
directory = /vagrant/Terraform
directory = /vagrant/Web-Expensify
directory = /vagrant/Web-PDFs
directory = /vagrant/Web-Secure
directory = /vagrant/Web-Static
directory = /vagrant/WhitelistDB
directory = /vagrant/Auth/externalLib/snowball
directory = /vagrant/Auth/externalLib/sss
directory = /vagrant/Auth/externalLib/sss/randombytes
directory = /vagrant/Bedrock/mbedtls
directory = /vagrant/Comp/vendor/expensify/PHP-Libs
directory = /vagrant/Comp/vendor/expensify/php-libs
directory = /vagrant/FuzzyBot/externalLib/snowball
directory = /vagrant/sqlog
directory = /vagrant/Server-Scraper/vendor/expensify/PHP-Libs
directory = /vagrant/Server-Scraper/vendor/expensify/php-libs
directory = /vagrant/Web-Expensify/vendor/expensify/Bedrock-PHP
directory = /vagrant/Web-Expensify/vendor/expensify/bedrock-php
directory = /vagrant/Web-Expensify/vendor/expensify/PHP-Libs
directory = /vagrant/Web-Expensify/vendor/expensify/php-libs
directory = /vagrant/Web-PDFs/var/pdfs.expensify.com/vendor/expensify/PHP-Libs
directory = /vagrant/Web-PDFs/var/pdfs.expensify.com/vendor/expensify/php-libs
directory = /vagrant/Web-PDFs/var/pdfs.expensify.com/vendor/jakubkulhan/chrome-devtools-protocol
directory = /vagrant/Web-Secure/vendor/expensify/Bedrock-PHP
directory = /vagrant/Web-Secure/vendor/expensify/bedrock-php
directory = /vagrant/Web-Secure/vendor/expensify/PHP-Libs
directory = /vagrant/Web-Secure/vendor/expensify/php-libs
directory = /vagrant/Web-Secure/vendor/soundasleep/html2text
directory = /vagrant/FuzzyBot
directory = /vagrant/FuzzyBo
directory = /vagrant/Cloudflare-Workers
directory = /vagrant/GitHub-Actions
directory = /vagrant/python-libs
directory = /vagrant/Chronos/vendor/coderstephen/slack-client
directory = /vagrant/Chronos/vendor/expensify/php-libs
directory = /vagrant/Email-Parsers/vendor/expensify/php-libs