forked from michaeljsmalley/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
61 lines (60 loc) · 1.58 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
[core]
editor = vim
[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"
np = !git --no-pager
da = !git branch --merged | grep -v "\\*" | xargs -n 1 git branch -d
au = add -u
mb = !git branch | grep carlos
# typos
dif = diff
difff = diff
shoe = git show
[pull]
rebase = false