-
Notifications
You must be signed in to change notification settings - Fork 4
/
gitconfig
84 lines (67 loc) · 1.93 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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
# .gitconfig
[user]
name = Igor Babuschkin
email = igor@babushk.in
[core]
editor = vim
pager = less
# Show unicode characters in filenames
quotepath = false
[diff]
tool = vimdiff
# Detect renames
renames = copies
prompt = false
[mergetool.fugitive]
cmd = 'vim -f -c "Gvdiffsplit!" "$MERGED"'
[mergetool.justconflicts]
cmd = "diffconflicts vim $BASE $LOCAL $REMOTE $MERGED"
trustExitCode = true
[merge]
tool = justconflicts
keepBackup = false
[color]
ui = true
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "status"]
added = green
changed = yellow
untracked = red
[format]
pretty = fuller
[rerere]
# Remember how conflicts were resolved
enabled = true
[advice]
# Disable advice for beginners
pushNonFastForward = false
pushNonFFCurrent = false
pushNonFFDefault = false
pushNonFFMatching = false
statusHints = false
commitBeforeMerge = false
resolveConflict = false
implicitIdentity = false
detachedHead = false
amWorkDir = false
[rebase]
# Allow rebase with unstaged changes
autoStash = true
[push]
# Sane default push behaviour
# (Only pushes the current branch)
default = upstream
[alias]
st = status -sb
lg = log --pretty=oneline --abbrev-commit --branches --remotes --graph --decorate
ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
alias = "!git config -l | grep alias | cut -c 7-"
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
# vim: ft=gitconfig