forked from sorin-ionescu/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathgitconfig.rrc
83 lines (83 loc) · 2.09 KB
/
gitconfig.rrc
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
[alias]
addremove = !git add --all && git ls-files --deleted -z | xargs -0 git rm
switch = checkout
unadd = reset --mixed
uncommit = reset --soft
undo = reset --hard
unstage = reset
co = checkout
ci = commit
st = status
br = branch
df = diff
pa = add --patch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
promote = !$ZSH/bin/git-promote
wtf = !$ZSH/bin/git-wtf
rank-contributers = !$ZSH/bin/git-rank-contributers
count = !git shortlog -sn
[user]
name = Tero Alén
email = [email protected]
[color]
ui = auto
[format]
numbered = auto
[core]
legacyheaders = false
excludesfile = ~/.gitignore
whitespace = trailing-space,space-before-tab
quotepath = false
autocrlf = input
safecrlf = true
[apply]
whitespace = warn
[repack]
usedeltabaseoffset = true
[branch]
autosetupmerge = true
[pager]
status = false
[tig]
show-date = relative
author-width = 8
show-rev-graph = yes
[advice]
pushNonFastForward = false
statusHints = false
[push]
default = tracking
[rerere]
enabled = true
[diff]
tool = vimdiff
guitool = ksdiff
mnemonicprefix = true
renames = copies
[difftool]
prompt = false
[difftool "ksdiff"]
cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
[merge]
tool = fugitive
[mergetool]
prompt = false
[mergetool "vimdiff3"]
cmd = vim -f -d -c \"wincmd J\" -c \"wincmd =\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = false
[mergetool "gvimdiff3"]
cmd = gvim -f -d -c \"wincmd J\" -c \"wincmd =\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
trustExitCode = false
[mergetool "fugitive"]
cmd = vim -f -c \"Gdiff\" \"$MERGED\" -c \"wincmd =\"
trustExitCode = false
[mergetool "gfugitive"]
cmd = gvim -f-c \"Gdiff\" \"$MERGED\" -c \"wincmd =\"
trustExitCode = false
[mergetool "splice"]
cmd = vim -f -c \"SpliceInit\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true
[mergetool "gsplice"]
cmd = gvim -f -c \"SpliceInit\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = true