forked from PProvost/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
41 lines (41 loc) · 861 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
34
35
36
37
38
39
40
41
[user]
name = PProvost
email = peter@provost.org
[color]
diff = auto
status = auto
branch = auto
[diff]
tool = p4merge
[merge]
tool = p4merge
[difftool "p4merge"]
cmd = "p4merge.exe $LOCAL $REMOTE"
[mergetool "p4merge"]
cmd = "p4merge $BASE $LOCAL $REMOTE $MERGED"
trustExitCode = true
keepBackup = false
[difftool "kdiff3"]
path = kdiff3.exe
keepBackup = false
trustExitCode = false
[mergetool "kdiff3"]
path = kdiff3.exe
keepBackup = false
trustExitCode = false
[core]
editor = gvim.exe
autocrlf = true
excludesfile = ~/.gitignore
[alias]
co = checkout
ci = commit
st = status
br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
type = cat-file -t
dump = cat-file -p
[push]
default = upstream
[credential]
helper = !'C:\\Users\\Peterpr\\AppData\\Roaming\\GitCredStore\\git-credential-winstore.exe'