-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
111 lines (92 loc) · 2.79 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
[user]
name = Paul Alexander
email = [email protected]
signingkey = 218BD2A9
[color]
branch = auto
diff = auto
status = auto
rebase = auto
ui = true
[core]
autocrlf = false
excludesfile = /Users/paulalexander/.gitignore_global
; preloadIndex = false
; fsmonitor = true
; untrackedCache = true
; pager = delta
; [interactive]
; diffFilter = delta --color-only --features=interactive
[init]
defaultBranch = master
[filter "media"]
clean = git-media-clean %f
smudge = git-media-smudge %f
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[http]
postBuffer = 524288000
[commit]
gpgsign = true
template = /Users/paulalexander/dotfiles/.gitcommit.template
cleanup = scissors
[gpg]
program = gpg
[maintenance]
repo = /Users/paulalexander/workspace/bark/bark-desktop
repo = /Users/paulalexander/workspace/bark/bark-www
repo = /Users/paulalexander/workspace/bark/bark-admin
repo = /Users/paulalexander/workspace/bark
[rebase]
updateRefs = true
[alias]
st = status
co = checkout --recurse-submodules
br = checkout --no-track -b
m = merge
mn = merge --no-ff --no-commit
rbc = rebase --continue
rbi = rebase --interactive
rbm = !git bam && git rebase -i origin/master
boom = !git remote prune origin && git fetch origin && git reset --hard origin/$( git rev-parse --abbrev-ref HEAD ) && git submodule update --recursive
bam = !DEFAULT_BRANCH=$(basename $(git rev-parse --abbrev-ref origin/HEAD)) && git co $DEFAULT_BRANCH && git boom && (git branch --format '%(refname:short)' --merged | egrep -v "^${DEFAULT_BRANCH}" | xargs git branch -d) && git checkout -
bamm = !DEFAULT_BRANCH=$(basename $(git rev-parse --abbrev-ref origin/HEAD)) && git co $DEFAULT_BRANCH && git boom && (git branch --format '%(refname:short)' --merged | egrep -v "^${DEAFULT_BRANCH}" | xargs git branch -d)
dt = difftool
dtc = difftool --cached
ca = commit --amend --no-edit --no-verify
cam = commit --amend
lg = log --graph --decorate
pushf = push origin HEAD --force-with-lease --no-verify
pusho = push origin HEAD
todo = diff head~ -Sfail -STODO
[diff]
renames = true
colorMoved = default
algorithm = histogram
[difftool]
prompt = false
[merge]
conflictstyle = diff3
[mergetool]
prompt = true
[delta]
navigate = true # use n and N to move between diff sections
show-syntax = true
side-by-side = true
true-color = always
line-numbers-left-format = "{nm:^3} "
line-numbers-right-format = " {nm:^3} "
commit-style = omit
hunk-header-decoration-style =
hunk-header-file-style = ""
hunk-header-line-number-style = ""
hunk-header-style = omit
[credential]
helper = store