-
Notifications
You must be signed in to change notification settings - Fork 2
/
.gitconfig
73 lines (73 loc) · 1.78 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
[user]
name = <Ghislain Rodrigues>
email = <[email protected]>
[core]
attributesfile = ~/.gitattributes
editor = vim
excludesfile = ~/.gitignore-global
pager = diff-so-fancy | less --tabs=4 -RFX
[rerere]
enabled = true
[alias]
st = status
co = checkout
ba = branch -v -a
ci = commit -v
history = log --graph --pretty=format:'%Cred%h%C(yellow)%d %Creset- %s %Cgreen(%ad) %C(blue)<%an>%Creset' --date=relative
svn-rebase = rebase --interactive --preserve-merges refs/remotes/git-svn
diffc = diff --color-words=.
diffw = "diff --color-words='([a-zA-Z0-9_]+|[^a-zA-Z0-9_\\s]+)'"
review = "!sh -c 'git log -p --reverse --topo-order $1..$2' -"
review-full = "!sh -c 'git diff master..$1' -"
show-merge = "!sh -c 'git log -p --reverse $1^..$1' -"
show-merge-full = "!sh -c 'git diff $1^..$1' -"
[color]
status = auto
pager = true
diff = auto
branch = auto
ui = true
[color.decorate]
branch = 11
[color.diff]
newMoved = magenta bold
oldMoved = magenta bold
# meta = 11
frag = blue bold
old = red bold
new = green bold
whitespace = red reverse
meta = white
func = 146 bold
commit = yellow bold
[diff]
colorMoved = plain
[interactive]
# needs a perl module, which can be installed by running as root:
# cpan Term::ReadKey
singleKey = yes
diffFilter = diff-so-fancy --patch
[push]
default = current
[init]
templatedir = ~/.git_template
defaultBranch = master
[merge]
tool = vim
conflictstyle = merge
[mergetool]
prompt = false
[mergetool "vim"]
cmd = vim $MERGED $BASE $LOCAL $REMOTE -c '/^\\(<<<<\\|====\\|>>>>\\)'
[mergetool "vimdiff"]
layout = MERGED
[help]
autocorrect = 1
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[diff-so-fancy]
stripLeadingSymbols = false
markEmptyLines = false