forked from guileen/config
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
37 lines (37 loc) · 959 Bytes
/
gitconfig
File metadata and controls
37 lines (37 loc) · 959 Bytes
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
[user]
email = guileen@gmail.com
name = Gui Lin
[giggle]
main-window-maximized = true
main-window-geometry = 0x0+0+0
main-window-view = FileView
history-view-vpane-position = 427
file-view-vpane-position = 220
file-view-hpane-position = 288
[diff]
tool = vimdiff
[difftool]
prompt = false
[alias]
d = difftool
s = status
co = checkout
lg = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit
pl = pull --ff-only
[color]
ui = auto
[core]
quotepath = false
autocrlf = input
excludesfile = /Users/gl/.gitignore
# mergeoptions = --no-ff --no-commit
[merge]
tool = vimdiff
[push]
default = matching
[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