-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig
87 lines (74 loc) · 1.91 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
[user]
name = Parker DeBardelaben
email = [email protected]
[core]
excludesfile = /Users/pdebardelaben/.gitignore
[color]
ui = true
diff = auto
stats = auto
branch = auto
interactive = auto
[alias]
aa = add --all
br = branch -vv
brd = branch -d
ca = commit --amend
cb = rev-parse --abbrev-ref HEAD
ci = commit
cm = !git add --all && git commit -m
cp = cherry-pick
cs = ci-status -v
css = !open $(hub ci-status -v | awk '{print $2}')/console
df = !git --no-pager diff HEAD
dfl = !git --no-pager diff HEAD~ HEAD
dfs = !git --no-pager diff --cached HEAD
fe = fetch
in = compare-remote in
lg = log --pretty=format:'%C(auto)%h%d - %an, %ar: %s' --reverse -10
lgr = log --pretty=format:'%C(auto)%h%d - %an, %ar: %s' --graph -10
lgg = !git log --pretty=format:'%C(auto)%h%d - %an, %ar: %s' --reverse | cat
mg = merge
ms = merge --squash
#open = !git co master && git sync && git co -b
out = compare-remote out
pop = stash pop
#pr = !git push -u origin HEAD && hub pull-request && git workon master
prr = !open $(hub browse -u -- pulls)
purge = !git fsck && git remote prune origin && git gc --prune=now
push = push --verbose
re = rebase
rmt = remote -v
rollback = reset HEAD^
root = rev-parse --show-toplevel
st = status --short --branch
sub = submodule
undo = checkout --
up = pull
[push]
default = upstream
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[include]
path = ~/.gitconfig-dayjob
[init]
defaultBranch = main
#[diff]
#external = difft
[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
[pull]
rebase = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[url "ssh://[email protected]/"]
insteadOf = https://github.com/