forked from l0b0/tilde
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
30 lines (30 loc) · 789 Bytes
/
.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
[user]
name = Victor Engmark
email = victor.engmark@gmail.com
[alias]
st = status
history = !qgit --all &
git = !git
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
lost = !"git fsck | awk '/dangling commit/ {print $3}' | git show --format='SHA1: %C(yellow)%h%Creset %f' --stdin | awk '/SHA1/ {sub(\"SHA1: \", \"\"); print}'"
[color]
diff = auto
status = auto
[merge]
conflictstyle = diff3
tool = mymeld
[mergetool "mymeld"]
cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $MERGED $REMOTE
[gui]
diffcontext = 3
[core]
quotepath = false
attributesfile = ~/.gitattributes
[github]
user = l0b0
[mergetool]
prompt = false
[push]
default = simple
[diff "odf"]
textconv = odt2txt