-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
54 lines (53 loc) · 1.41 KB
/
.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
42
43
44
45
46
47
48
49
50
51
52
53
54
[user]
name = Marek Waligórski
email = marek.waligorski@gmail.com
signingkey = DFEEFC01CB02779EC36ECB9001BA0A394E108BF8
[alias]
co = checkout
st = status
br = branch
df = diff
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Cblue %an %Creset' --abbrev-commit --date=relative
ld = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Cblue %an %Creset' --abbrev-commit --date=relative --color-words -i -p
amend = commit --amend
pr = pull --rebase
date = show -s --format=%ci
head = rev-parse HEAD
[help]
autocorrect = 1
[color]
ui = true
diff = auto
status = auto
branch = auto
[core]
excludesfile = ~/.gitignore
editor = vim
autocrlf = input
[apply]
whitespace = nowarn
[format]
pretty = %C(yellow)%h%Creset %s %C(red)(%an, %cr)%Creset
[push]
default = simple
[merge]
tool = p4mergetool
[mergetool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
trustExitCode = false
[mergetool]
keepBackup = false
[diff]
tool = p4mergetool
[difftool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE
[include]
path = ~/.gitconfig-local
[includeIf "gitdir:~/wojtas/"]
path = ~/.gitconfig-bnb
[includeIf "gitdir:~/manomano/"]
path = ~/.gitconfig-manomano
[gpg]
program = gpg
[commit]
gpgsign = true