-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
executable file
·94 lines (94 loc) · 3.01 KB
/
gitconfig
File metadata and controls
executable file
·94 lines (94 loc) · 3.01 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
[alias]
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
lg3 = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
quicklog = log --pretty=format:'%Cblue%h %Cred%cD %Creset%cn %Cgreen%s%Creset' --date-order --graph
plog = log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'
tlog = log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative
lg = !"git lg3"
rank = shortlog -sn --no-merges
freebase = pull --rebase
undo = reset --soft --keep HEAD^
unstage = restore --staged
# Shortening aliases
st = status
g = grep
sl = stash list
sa = stash apply
sd = stash drop
sp = stash pop
co = checkout
cob = checkout -b
ap = add . -N -p
ci = commit -m
ca = commit -am
f = fetch -p
p = push
pf = push --force
pfl = push --force-with-lease
pl = pull
plm = pull origin master
br = branch
ba = branch -a
bd = branch -d
bD = branch -D
dc = diff --cached
gbn = rev-parse --abbrev-ref HEAD
# Complex aliases
bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d"
cleanup-merged = "!f() { git branch --merged | grep -v \"master\" | grep -v \"main\" | xargs git branch -d; }; f"
sw = switch
loga = log --graph --decorate --name-status --all
swf = !git for-each-ref --format='%(refname:short)' refs/heads | fzf | xargs git switch
rbf = !git for-each-ref --format='%(refname:short)' refs/heads | fzf | xargs git rebase
mergefzf = "!f() { local branch=$(git branch --format=\"%(refname:short)\" | fzf); git merge --no-ff $branch -m \"$1\"; }; f"
staash = stash --all
diffw = diff --word-diff
blameccc = blame -w -C -C -C
[user]
name = Jacopo Ghisolfi
email = jacopo.ghisolfi@marleyspoon.com
username = jacopoms
[github]
user = jacopoms
[core]
editor = nvim
excludesFile = ~/.gitignore_global
pager = delta
[color]
status = auto
branch = auto
interactive = auto
diff = auto
ui = auto
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[hub]
protocol = https
[pull]
rebase = true
[push]
default = current
[credential]
helper = osxkeychain
[rerere]
enabled = true
autoUpdate = true
[column]
ui = auto
[branch]
sort = -committerdate
[safe]
directory = ~/.oh-my-zsh
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true
dark = false
[merge]
conflictStyle = zdiff3
[advice]
skippedCherryPicks = false