-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
44 lines (44 loc) · 1.22 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
[alias]
b = branch
ci = commit
co = checkout
conf = config
d = diff
ds = diff --staged
dt = difftool
f = fetch --prune
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
ll = log --graph --branches --remotes --date-order --decorate --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
m = merge
p = pull --prune
pick = cherry-pick
r = remote
s = "!showtool() { rev=$(git rev-parse \"${1:-HEAD}\"); shift; git difftool $rev~1 $rev \"$@\"; }; showtool"
st = status
sub = submodule
sup = submodule update --recursive
[color]
ui = auto
[core]
pager = delta --24-bit-color=always --line-numbers --navigate --side-by-side
[diff]
algorithm = patience
mnemonicprefix = true
renames = copies
tool = difftastic
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft --display=side-by-side-show-both --missing-as-empty --skip-unchanged "$LOCAL" "$REMOTE"
[merge]
conflictstyle = diff3
[pager]
difftool = true
[pull]
ff = only
[push]
default = simple
followTags = true
[rerere]
autoupdate = true
enabled = true