-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
64 lines (63 loc) · 1.64 KB
/
Copy pathgitconfig
File metadata and controls
64 lines (63 loc) · 1.64 KB
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
[user]
name = Stephane Leclercq
email = leclercq@ekino.com
[color]
ui = auto
[alias]
st = status
ci = commit
lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%an %cr)%Creset'
co = checkout
[core]
#pager = cat
pager = diff-so-fancy | less --tabs=4 -RFX
#
# Out of luck: on Windows w/o msysGit? You may have Notepad++…
# editor = 'C:/Program Files/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin
#
# If you want to use Sublime Text 2's subl wrapper:
# editor = subl -w
#
# whitespace = -trailing-space
# whitespace = tab-in-indent
autocrlf = input
excludesfile = /Users/sleclercq/.gitignore_global
# safecrlf = true
[diff]
mnemonicPrefix = true
wordRegex = .
renameLimit = 10000
[fetch]
recurseSubmodules = on-demand
prune = true
[grep]
extendedRegexp = true
[log]
abbrevCommit = true
[merge]
conflictStyle = diff3
tool = meld
[rebase]
autoStash = true
[mergetool]
keepBackup = false
keepTemporaries = false
prompt = false
[pull]
rebase = true
[push]
default = simple
[rerere]
# If, like me, you like rerere, decomment these
autoupdate = true
enabled = true
[status]
submoduleSummary = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[credential]
helper = osxkeychain