-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
33 lines (33 loc) · 917 Bytes
/
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
[user]
name = Rachel Singh
email = [email protected]
[push]
default = current
[core]
autocrlf = input
[alias]
hist = log --graph --pretty=format:"%C(yellow)%h\\ %Cgreen%ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
cfiles = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
graph = log --all --decorate --oneline --graph
[diff]
tool = winmerge
[difftool "winmerge"]
name = WinMerge
trustExitCode = true
prompt = false
cmd = "'C:/Program Files (x86)/WinMerge/WinMergeU.exe'" -u -e "$LOCAL" "$REMOTE"
[mergetool]
prompt = false
keepBackup = false
keepTemporaries = false
[merge]
tool = winmerge
[mergetool "winmerge"]
name = WinMerge
trustExitCode = true
cmd = "'C:/Program Files (x86)/WinMerge/WinMergeU.exe'" -u -e dl "Local" -dr "Remote" $LOCAL $REMOTE $MERGED
[credential]
helper = wincred
modalprompt = true
[help]
autocorrect = 1