-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
74 lines (73 loc) · 1.77 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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
[user]
name = Ryan Tvenge
email = [email protected]
[core]
editor = vim
fileMode = false
excludesfile = ~/.gitignore_global
pager = diff-so-fancy | less --tabs=4 -RFX
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[diff]
tool = Kaleidoscope
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[merge]
tool = Kaleidoscope
[url "https://"]
insteadOf = git://
[push]
default = simple
[pull]
rebase = false
[alias]
st = status --branch --short
wat = log --graph --decorate --oneline -15
co = checkout
patch = add --patch
unstage = reset --hard
unstage-patch = reset HEAD --patch
com = commit -m
coma = commit -am
devpull = pull origin develop:develop
ocmitt = commit
# Not working
# cwp = commit -am "upgrading wordpress core/themes/plugins"
amend = commit --amend --no-edit
follow = log --follow -p
[help]
autocorrect = 1
[interactive]
diffFilter = diff-so-fancy --patch
[color]
ui = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 11
frag = magenta bold
func = 146 bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
# Put this in your ~/.config/git/config file so your signingkey isn't in the repo.
# [user]
# name = Ryan Tvenge
# email = [email protected]
# signingkey = "ssh-rsa ..."
# [gpg]
# format = ssh
# [gpg "ssh"]
# program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
# [commit]
# gpgsign = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true