-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
89 lines (89 loc) · 2.19 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
[core]
editor = nvim
excludesfile = /Users/scott/.gitignore_global
whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol
pager = "less -F -X"
[merge]
tool = vimdiff
log = true
[github]
user = sc0ttman
[include]
path = ~/.gitconfig.local
[init]
templatedir = ~/.git_template
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[url "[email protected]:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
[url "git://github.com/"]
insteadOf = "github:"
[url "[email protected]:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
[credential]
helper = cache --timeout 28800
[push]
default = simple
[pull]
rebase = false
[color]
ui = auto
[diff]
tool = vimdiff
colorMoved = zebra
[rebase]
autosquash = true
[alias]
c = commit
cm = commit -m
co = checkout
cob = checkout -b
br = branch -av # Show all branches
aa = add --all
ap = add -p # patch - Interactively choose hunks of patch between the index and the work tree
up = pull
pl = pull
p = push
pf = push -f
s = status -s
m = merge
ls = ls-files
d = diff
undo = reset --soft 'HEAD^'
df = diff --color --color-words --abbrev
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
# Show the diff between the latest commit and the current state
d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
#############
sa = stash apply
sc = stash clear
sd = stash drop
sl = stash list
sp = stash pop
ss = stash save
sw = stash show
#############
cp = cherry-pick
cpa = cherry-pick --abort
cpc = cherry-pick --continue
#############
[gpg]
program = gpg
[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
[user]
name = Scott Luedtke
email = [email protected]