-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
45 lines (45 loc) · 1.36 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
[user]
name = Lore Anaya Pozo
email = [email protected]
signingkey = 66203BDFF494F233
[commit]
gpgsign = true
[alias]
lol = log --all --graph --date-order --pretty=format:'%C(yellow)%h%C(bold red)%d%Creset %s %Cgreen{%an} %Cblue%cr%Creset' --abbrev-commit
lob = log --date-order --pretty=format:'%C(yellow)%h%C(bold red)%d%Creset %s %Cgreen{%an} %Cblue%cr%Creset' --abbrev-commit
l = lol
lat = !git fetch --all && git checkout origin/master
a = add
amend = !git commit --amend --no-edit --date=\"$(date -R)\"
b = branch -vv
c = commit
co = checkout
cod = checkout -B
cp = cherry-pick
# cpr = "cherry-pick rebase" (for rebasing target branch atop HEAD in single-commit workflows)
cpr = !git-cpr
#cpr = "!cpr() { git co --detach && git cp $1 && git cod $1 || echo 'cherry-pick failed, you must run git cod '$1' after resolving.' }; cpr"
d = diff
del = !git-del
ds = diff --staged
f = fetch --all
nb = !git-nb
o = checkout
r = rebase
s = status # -uno
ss = status
swatch = !watch -c -n 10 git -c color.status=always status
[core]
pager = delta --diff-so-fancy
editor = vim
excludesFiles = ~/.gitignore
[color]
ui = true
[diff]
compactionHeuristic = true
[pull]
rebase = true
[advice]
detachedHead = false
[merge]
conflictstyle = diff3