-
Notifications
You must be signed in to change notification settings - Fork 3
/
.gitconfig
113 lines (93 loc) · 2.66 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
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
[user]
name = Kevin Jalbert
email = [email protected]
signingkey = 872695935A2B2C8A
[core]
excludesfile = /Users/jalbert/.gitignore_global
editor = nvim
filemode = true
pager = delta --syntax-theme "GitHub"
commitGraph = true
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[branch]
autosetuprebase = always
[push]
default = simple
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[alias]
pf = push --force-with-lease
st = status -s
co = checkout
ls = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
la = "!git config -l | grep alias | cut -c 7-"
cdiff = "diff --cached"
branch-diff = !git diff $(git merge-base HEAD origin/master)
save = !sh -c 'export PREV=$(git symbolic-ref HEAD|cut -d/ -f3-) && git checkout -b "$1" && git commit -am "$1" && git checkout "$PREV"' -
patch = !git --no-pager diff --no-color --no-prefix
git = !exec git
# Working with forked-PRs in owned repos: https://gist.github.com/gvaughn/f3c7897a51e52138eac1
copr = "!f() { git fetch -fu origin refs/pull/$1/head:pr-$1; git checkout pr-$1; } ; f"
prunepr = "!git for-each-ref refs/heads/pr-* --format='%(refname:short)' | while read ref ; do git branch -D $ref ; done"
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustexitcode = true
[merge]
tool = Kaleidoscope
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[mergetool]
prompt = false
[diff]
tool = Kaleidoscope
algorithm = patience
[github]
user = kevinjalbert
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[commit]
gpgsign = true
template = /Users/jalbert/.stCommitMsg
[gpg]
program = /usr/local/bin/gpg
[protocol]
version = 2
[gc]
writeCommitGraph = true
[url "https://github.com/Shopify/"]
insteadOf = [email protected]:Shopify/
insteadOf = [email protected]:shopify/
insteadOf = ssh://[email protected]/Shopify/
insteadOf = ssh://[email protected]/shopify/
[pull]
ff = only
[rerere]
enabled = true
[rebase]
autoStash = true
autosquash = true
[init]
defaultBranch = main