-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
executable file
·29 lines (29 loc) · 858 Bytes
/
.gitconfig
File metadata and controls
executable file
·29 lines (29 loc) · 858 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
[user]
name = NODA, Kunihiro
[color]
diff = auto
status = auto
branch = auto
interactive = auto
[core]
editor = vim -c \"set fenc=utf-8\"
autocrlf = false
filemode = false
preloadindex = true
fscache = true
whitespace = cr-at-eol
quotepath = false
[diff]
tool = WinMerge
[difftool "WinMerge"]
cmd = 'C:/Program Files/WinMerge/WinMergeU.exe' -e -r -ub -dl \"$LOCAL\" -dr \"$REMOTE\" \"$(cygpath -am \"$LOCAL\")\" \"$(cygpath -am \"$REMOTE\")\"
[merge]
tool = WinMerge
[mergetool "WinMerge"]
cmd = 'C:/Program Files/WinMerge/WinMergeU.exe' -am -e -u -wl -wr \"$(cygpath -am \"$LOCAL\")\" \"$(cygpath -am \"$BASE\")\" \"$(cygpath -am \"$REMOTE\")\" -o \"$(cygpath -am \"$MERGED\")\"
trustExitCode = false
[alias]
df = diff --color-words --word-diff
sh = push origin master
ll = pull origin master